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]
2023-01-20 18:01:36 +00:00
committed by GitHub
parent ccc7f01a07 cfb43ad7b9
commit 29327d1e59
101 changed files with 534 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+10
View File
@@ -270,6 +270,16 @@
stage-2.
</para>
</listitem>
<listitem>
<para>
<literal>teleport</literal> has been upgraded to major version
11. Please see upstream
<link xlink:href="https://goteleport.com/docs/setup/operations/upgrading/">upgrade
instructions</link> and
<link xlink:href="https://goteleport.com/docs/changelog/#1100">release
notes</link>.
</para>
</listitem>
<listitem>
<para>
The EC2 image module previously detected and activated
nixos/doc/manual/release-notes/rl-2305.section.md
+2
View File
@@ -71,6 +71,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2.
- `teleport` has been upgraded to major version 11. Please see upstream [upgrade instructions](https://goteleport.com/docs/setup/operations/upgrading/) and [release notes](https://goteleport.com/docs/changelog/#1100).
- The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation.
- Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.
nixos/modules/config/no-x-libs.nix
+9 -1
View File
@@ -32,13 +32,17 @@ with lib;
dbus = super.dbus.override { x11Support = false; };
ffmpeg_4 = super.ffmpeg_4-headless;
ffmpeg_5 = super.ffmpeg_5-headless;
# dep of graphviz, libXpm is optional for Xpm support
gd = super.gd.override { withXorg = false; };
gobject-introspection = super.gobject-introspection.override { x11Support = false; };
gpsd = super.gpsd.override { guiSupport = false; };
graphviz = super.graphviz-nox;
gst_all_1 = super.gst_all_1 // {
gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableX11 = false; };
};
gpsd = super.gpsd.override { guiSupport = false; };
imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };
imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };
libdevil = super.libdevil-nox;
libextractor = super.libextractor.override { gtkSupport = false; };
libva = super.libva-minimal;
limesuite = super.limesuite.override { withGui = false; };
@@ -51,9 +55,13 @@ with lib;
networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; };
networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; };
networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
pango = super.pango.override { x11Support = false; };
pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };
qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });
stoken = super.stoken.override { withGTK3 = false; };
# translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11
util-linux = super.util-linux.override { translateManpages = false; };
zbar = super.zbar.override { enableVideo = false; withXorg = false; };
}));
};
nixos/modules/installer/tools/nixos-install.sh
+14 -12
View File
@@ -188,17 +188,6 @@ nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \
mkdir -m 0755 -p "$mountPoint/etc"
touch "$mountPoint/etc/NIXOS"
# Create a bind mount for each of the mount points inside the target file
# system. This preserves the validity of their absolute paths after changing
# the root with `nixos-enter`.
# Without this the bootloader installation may fail due to options that
# contain paths referenced during evaluation, like initrd.secrets.
if (( EUID == 0 )); then
mount --rbind --mkdir "$mountPoint" "$mountPoint$mountPoint"
mount --make-rslave "$mountPoint$mountPoint"
trap 'umount -R "$mountPoint$mountPoint" && rmdir "$mountPoint$mountPoint"' EXIT
fi
# Switch to the new system configuration. This will install Grub with
# a menu default pointing at the kernel/initrd/etc of the new
# configuration.
@@ -206,7 +195,20 @@ if [[ -z $noBootLoader ]]; then
echo "installing the boot loader..."
# Grub needs an mtab.
ln -sfn /proc/mounts "$mountPoint"/etc/mtab
NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot
export mountPoint
NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF'
# Create a bind mount for each of the mount points inside the target file
# system. This preserves the validity of their absolute paths after changing
# the root with `nixos-enter`.
# Without this the bootloader installation may fail due to options that
# contain paths referenced during evaluation, like initrd.secrets.
# when not root, re-execute the script in an unshared namespace
mount --rbind --mkdir / "$mountPoint"
mount --make-rslave "$mountPoint"
/run/current-system/bin/switch-to-configuration boot
umount -R "$mountPoint" && rmdir "$mountPoint"
EOF
)"
fi
# Ask the user to set a root password, but only if the passwd command
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+22 -7
View File
@@ -42,7 +42,7 @@ def system_dir(profile: Optional[str], generation: int, specialisation: Optional
else:
return d
BOOT_ENTRY = """title @distroName@{profile}{specialisation}
BOOT_ENTRY = """title {title}
version Generation {generation} {description}
linux {kernel}
initrd {initrd}
@@ -106,14 +106,29 @@ def describe_generation(generation_dir: str) -> str:
return description
def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str], machine_id: str) -> None:
def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str],
machine_id: str, current: bool) -> None:
kernel = copy_from_profile(profile, generation, specialisation, "kernel")
initrd = copy_from_profile(profile, generation, specialisation, "initrd")
title = "@distroName@{profile}{specialisation}".format(
profile=" [" + profile + "]" if profile else "",
specialisation=" (%s)" % specialisation if specialisation else "")
try:
append_initrd_secrets = profile_path(profile, generation, specialisation, "append-initrd-secrets")
subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)])
except FileNotFoundError:
pass
except subprocess.CalledProcessError:
if current:
print("failed to create initrd secrets!", file=sys.stderr)
sys.exit(1)
else:
print("warning: failed to create initrd secrets "
f'for "{title} - Configuration {generation}", an older generation', file=sys.stderr)
print("note: this is normal after having removed "
"or renamed a file in `boot.initrd.secrets`", file=sys.stderr)
entry_file = "@efiSysMountPoint@/loader/entries/%s" % (
generation_conf_filename(profile, generation, specialisation))
generation_dir = os.readlink(system_dir(profile, generation, specialisation))
@@ -123,8 +138,7 @@ def write_entry(profile: Optional[str], generation: int, specialisation: Optiona
with open("%s/kernel-params" % (generation_dir)) as params_file:
kernel_params = kernel_params + params_file.read()
with open(tmp_path, 'w') as f:
f.write(BOOT_ENTRY.format(profile=" [" + profile + "]" if profile else "",
specialisation=" (%s)" % specialisation if specialisation else "",
f.write(BOOT_ENTRY.format(title=title,
generation=generation,
kernel=kernel,
initrd=initrd,
@@ -281,10 +295,11 @@ def main() -> None:
remove_old_entries(gens)
for gen in gens:
try:
write_entry(*gen, machine_id)
is_default = os.readlink(system_dir(*gen)) == args.default_config
write_entry(*gen, machine_id, current=is_default)
for specialisation in get_specialisations(*gen):
write_entry(*specialisation, machine_id)
if os.readlink(system_dir(*gen)) == args.default_config:
write_entry(*specialisation, machine_id, current=is_default)
if is_default:
write_loader_conf(*gen)
except OSError as e:
profile = f"profile '{gen.profile}'" if gen.profile else "default profile"
nixos/tests/installer.nix
+1 -1
View File
@@ -51,7 +51,7 @@ let
boot.loader.systemd-boot.enable = true;
''}
boot.initrd.secrets."/etc/secret" = /etc/nixos/secret;
boot.initrd.secrets."/etc/secret" = ./secret;
users.users.alice = {
isNormalUser = true;
pkgs/applications/emulators/ruffle/default.nix
+3 -3
View File
@@ -19,13 +19,13 @@
rustPlatform.buildRustPackage rec {
pname = "ruffle";
version = "nightly-2022-09-26";
version = "nightly-2022-12-16";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = pname;
rev = version;
sha256 = "sha256-o0geKXODFRPKN4JgW+Sg16uPhBS5rrlMCmFSc9AcNPQ=";
sha256 = "sha256-VOaXn/dJB0AbuZ8owBbUYEPrL/H8DM73MhwhBjxq2Pg=";
};
nativeBuildInputs = [
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
"''${gappsWrapperArgs[@]}"
'';
cargoSha256 = "sha256-erqBuU66k7SGG9ueyYEINjeXbyC7A2I/r1bBqdsJemY=";
cargoSha256 = "sha256-h5qshincT48zYvbNLMXcvxw7Ovupnn9c93lpqY7oNtc=";
meta = with lib; {
description = "An Adobe Flash Player emulator written in the Rust programming language.";
pkgs/applications/file-managers/felix-fm/default.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "felix";
version = "2.2.2";
version = "2.2.3";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-VKesly7Jp1PgukArNKvDGzSRh7DaL3A/Dub3dLR6ET4=";
sha256 = "sha256-VQTZj2BCdV2TnXrYRaJqrf9sR35zsojmeoe7t+I3kyQ=";
};
cargoSha256 = "sha256-7+4SIBnu4R2mbH2nWBX9BmJL1n8t46d1vrMpNaUHAo4=";
cargoSha256 = "sha256-jH2BaPiGanBOlOU7JQZ0c0ObCaVURpjvmx2m92Fbdm4=";
nativeBuildInputs = [ pkg-config ];
pkgs/applications/misc/authy/default.nix
+3 -3
View File
@@ -10,12 +10,12 @@
stdenv.mkDerivation rec {
pname = "authy";
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version'
version = "2.2.1";
rev = "11";
version = "2.2.2";
rev = "12";
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
sha256 = "sha256-/a0pMXVd7mEp7oaN2mBIJv5uOv1zQ3gvfgiz1XL9ZmM=";
sha256 = "sha256-vSbqT2s5lLEU1SSDaC+sS6qt446iSKYUgKudO5WMOu4=";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];
pkgs/applications/misc/bitwarden-menu/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ lib
, buildPythonApplication
, fetchPypi
, pynput
, xdg
}:
buildPythonApplication rec {
pname = "bitwarden-menu";
version = "0.4.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-OC+MHEiUU6bDT2wSSDtu0KnwDwBpbLTBta0xjfuzlOI=";
};
propagatedBuildInputs = [
pynput
xdg
];
doCheck = false;
meta = with lib; {
changelog = "https://github.com/firecat53/bitwarden-menu/releases/tag/v${version}";
description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database.";
homepage = "https://github.com/firecat53/bitwarden-menu";
license = licenses.mit;
maintainers = [ maintainers.rodrgz ];
};
}
pkgs/applications/misc/jrnl/default.nix
+5 -5
View File
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "jrnl";
version = "3.0";
version = "3.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "jrnl-org";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wyN7dlAbQwqvES8qEJ4Zo+fDMM/Lh9tNjf215Ywop10=";
rev = "refs/tags/v${version}";
sha256 = "sha256-e2w0E8t6s0OWx2ROme2GdyzWhmCc6hnMfSdLTZqt3bg=";
};
nativeBuildInputs = with python3.pkgs; [
@@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'
--replace 'rich = "^12.2.0"' 'rich = ">=12.2.0, <14.0.0"'
'';
preCheck = ''
@@ -66,6 +66,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Simple command line journal application that stores your journal in a plain text file";
homepage = "https://jrnl.sh/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ zalakain ];
maintainers = with maintainers; [ bryanasdev000 zalakain ];
};
}
pkgs/applications/misc/whalebird/default.nix
+4 -4
View File
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "whalebird";
version = "4.6.5";
version = "4.7.4";
src = let
downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
if stdenv.system == "x86_64-linux" then
fetchurl {
url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2";
sha256 = "sha256-WeZnWEwRbZEnYkLwWf6EC3ZbwI+Cr59czdKxxG/Lhn0=";
sha256 = "sha256-jRtlnKlrh6If9wy3FqVBtctQO3rZJRwceUWAPmieT4A=";
}
else if stdenv.system == "aarch64-linux" then
fetchurl {
url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2";
sha256 = "sha256-5iKVP7zOci5X+EhnfJx5cZ5RiqZKz1pFLDUwZncynUc=";
sha256 = "sha256-gWCBH2zfhJdJ3XUAxvZ0+gBHye5uYCUgX1BDEoaruxY=";
}
else
throw "Whalebird is not supported for ${stdenv.system}";
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
# Necessary steps to find the tray icon
asar extract opt/Whalebird/resources/app.asar "$TMP/work"
substituteInPlace $TMP/work/dist/electron/main.js \
--replace "Ao,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
--replace "qt,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar
runHook postBuild
pkgs/applications/networking/cluster/hubble/default.nix
+1 -1
View File
@@ -39,7 +39,7 @@ buildGoModule rec {
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "Network, Service & Security Observability for Kubernetes using eBPF";
license = licenses.asl20;
homepage = "https://github.com/cilium/hubble/";
pkgs/applications/science/misc/openmvg/default.nix
+5 -5
View File
@@ -8,14 +8,14 @@
, enableDocs ? false }:
stdenv.mkDerivation rec {
version = "2.0";
version = "unstable-2022-12-30";
pname = "openmvg";
src = fetchFromGitHub {
owner = "openmvg";
repo = "openmvg";
rev = "v${version}";
sha256 = "sha256-6F/xUgZpqY+v6CpwTBhIXI4JdT8HVB0P5JzOL66AVd8=";
rev = "e1bbfe801986cd7171f36443a1573b0f69f3702d";
sha256 = "sha256-DngfmejNFw5pogTo7Ec5aUey2LUQIojvJybLmtCfvVY=";
fetchSubmodules = true;
};
@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "all" ];
meta = {
broken = (stdenv.isLinux && stdenv.isAarch64);
broken = stdenv.isDarwin && stdenv.isx86_64;
description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community";
homepage = "https://openmvg.readthedocs.io/en/latest/";
license = lib.licenses.mpl20;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ mdaiter ];
};
}
pkgs/applications/science/misc/openmvs/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, eigen, opencv, cgal, ceres-solver, boost, vcg, glfw, zstd }:
let
boostWithZstd = boost.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [ zstd ];
});
in
stdenv.mkDerivation rec {
version = "2.1.0";
pname = "openmvs";
src = fetchFromGitHub {
owner = "cdcseacave";
repo = "openmvs";
rev = "v${version}";
sha256 = "sha256-eqNprBgR0hZnbLKLZLJqjemKxHhDtGblmaSxYlmegsc=";
fetchSubmodules = true;
};
# SSE is enabled by default
cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF";
buildInputs = [ eigen opencv cgal ceres-solver vcg glfw boostWithZstd ];
nativeBuildInputs = [ cmake pkg-config ];
meta = {
description = "Open Multi-View Stereo reconstruction library";
homepage = "https://github.com/cdcseacave/openMVS";
license = lib.licenses.agpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ bouk ];
};
}
pkgs/applications/version-management/gitea/default.nix
+2 -2
View File
@@ -15,12 +15,12 @@
buildGoPackage rec {
pname = "gitea";
version = "1.18.1";
version = "1.18.2";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-FUliQ77P0WiwB1dWHDY3FjeJdHhUAcs/97JKXBdEdl0=";
hash = "sha256-NqlY5s3tZT9HO6X0knlTPwoY6tMsYm9SyH3CEZpIcy0=";
};
patches = [
pkgs/applications/version-management/got/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "got";
version = "0.79";
version = "0.81";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
sha256 = "sha256-eL4cCpBRhO0ctQZGg1n6+H5O6GhRKRsWcEOcRr+z2Hw=";
sha256 = "sha256-ayPXOtqJIJAzDTY1T4rw9GF7KvfI2XJ/c9uo4Fs8db8=";
};
nativeBuildInputs = [ pkg-config bison ];
pkgs/build-support/bintools-wrapper/default.nix
+2 -1
View File
@@ -25,6 +25,7 @@
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, propagateDoc ? bintools != null && bintools ? man
, extraPackages ? [], extraBuildCommands ? ""
, isGNU ? bintools.isGNU or false, isLLVM ? bintools.isLLVM or false
, buildPackages ? {}
, targetPackages ? {}
, useMacosReexportHack ? false
@@ -108,7 +109,7 @@ stdenv.mkDerivation {
passthru = {
inherit targetPrefix suffixSalt;
inherit bintools libc nativeTools nativeLibc nativePrefix;
inherit bintools libc nativeTools nativeLibc nativePrefix isGNU isLLVM;
emacsBufferSetup = pkgs: ''
; We should handle propagation here too
pkgs/build-support/cc-wrapper/default.nix
+1
View File
@@ -264,6 +264,7 @@ stdenv.mkDerivation {
+ optionalString cc.langGo or false ''
wrap ${targetPrefix}gccgo $wrapper $ccPath/${targetPrefix}gccgo
wrap ${targetPrefix}go ${./go-wrapper.sh} $ccPath/${targetPrefix}go
'';
strictDeps = true;
pkgs/build-support/cc-wrapper/go-wrapper.sh
+11
View File
@@ -0,0 +1,11 @@
#! @shell@
set -eu -o pipefail +o posix
shopt -s nullglob
if (( "${NIX_DEBUG:-0}" >= 7 )); then
set -x
fi
export GCCGO="@out@/bin/gccgo"
exec @prog@ "$@"
pkgs/development/compilers/gcc/10/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@@ -202,7 +202,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross threadsCross
version
gmp mpfr libmpc isl
binutils gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/11/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@@ -206,7 +206,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross threadsCross
version
gmp mpfr libmpc isl
binutils gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/12/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, libucontext ? null
@@ -250,7 +250,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross threadsCross
version
gmp mpfr libmpc isl
binutils gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/4.8/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkg-config ? null
@@ -207,7 +207,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross threadsCross
version
gmp mpfr libmpc isl
binutils gmp mpfr libmpc isl
cloog
enableLTO
pkgs/development/compilers/gcc/4.9/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkg-config ? null
@@ -227,7 +227,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross threadsCross
version
gmp mpfr libmpc isl
binutils gmp mpfr libmpc isl
cloog
enableLTO
pkgs/development/compilers/gcc/6/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
, texinfo ? null
, flex
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, gnatboot ? null
@@ -238,7 +238,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross threadsCross
version
gmp mpfr libmpc isl
binutils gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/7/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, enableMultilib ? false
@@ -206,7 +206,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross threadsCross
version
gmp mpfr libmpc isl
binutils gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/8/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, enableMultilib ? false
@@ -188,7 +188,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross threadsCross
version
gmp mpfr libmpc isl
binutils gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/9/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
, enableLTO ? !stdenv.hostPlatform.isStatic
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
@@ -201,7 +201,7 @@ stdenv.mkDerivation ({
crossStageStatic libcCross threadsCross
version
gmp mpfr libmpc isl
binutils gmp mpfr libmpc isl
enableLTO
enableMultilib
pkgs/development/compilers/gcc/common/configure-flags.nix
+2 -2
View File
@@ -5,7 +5,7 @@
, threadsCross
, version
, gmp, mpfr, libmpc, isl
, binutils, gmp, mpfr, libmpc, isl
, cloog ? null
, enableLTO
@@ -51,7 +51,7 @@ let
crossConfigureFlags =
# Ensure that -print-prog-name is able to find the correct programs.
[
"--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
"--with-as=${if targetPackages.stdenv.cc.bintools.isLLVM then binutils else targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
"--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld"
]
++ (if crossStageStatic then [
pkgs/development/compilers/go/1.18.nix
+2 -2
View File
@@ -17,7 +17,7 @@
}:
let
goBootstrap = buildPackages.callPackage ./bootstrap116.nix { };
goBootstrap = if stdenv.buildPlatform.isMusl then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
skopeoTest = skopeo.override { buildGoModule = buildGo118Module; };
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
GOROOT_BOOTSTRAP = if stdenv.buildPlatform.isMusl then goBootstrap else "${goBootstrap}/share/go";
buildPhase = ''
runHook preBuild
pkgs/development/compilers/go/1.19.nix
+2 -2
View File
@@ -17,7 +17,7 @@
}:
let
goBootstrap = buildPackages.callPackage ./bootstrap116.nix { };
goBootstrap = if stdenv.buildPlatform.isMusl then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
skopeoTest = skopeo.override { buildGoModule = buildGo119Module; };
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
GOROOT_BOOTSTRAP = if stdenv.buildPlatform.isMusl then goBootstrap else "${goBootstrap}/share/go";
buildPhase = ''
runHook preBuild
pkgs/development/compilers/go/1.20.nix
+2 -2
View File
@@ -17,7 +17,7 @@
}:
let
goBootstrap = buildPackages.callPackage ./bootstrap117.nix { };
goBootstrap = if stdenv.buildPlatform.isMusl then buildPackages.gccgo else buildPackages.callPackage ./bootstrap117.nix { };
skopeoTest = skopeo.override { buildGoModule = buildGo120Module; };
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
GOROOT_BOOTSTRAP = if stdenv.buildPlatform.isMusl then goBootstrap else "${goBootstrap}/share/go";
buildPhase = ''
runHook preBuild
pkgs/development/compilers/graalvm/community-edition/update.nix
+2
View File
@@ -67,6 +67,7 @@ let
"ruby-installable-svm" = ".jar";
"wasm-installable-svm" = ".jar";
"python-installable-svm" = ".jar";
"js-installable-svm" = ".jar";
}.${productName};
# getProductSuffix :: String -> String
@@ -77,6 +78,7 @@ let
"ruby-installable-svm" = "https://github.com/oracle/truffleruby/releases/download";
"wasm-installable-svm" = "https://github.com/graalvm/graalvm-ce-builds/releases/download";
"python-installable-svm" = "https://github.com/graalvm/graalpython/releases/download";
"js-installable-svm" = "https://github.com/oracle/graaljs/releases/download";
}.${productName};
# getDevUrl :: String
pkgs/development/compilers/llvm/10/bintools/default.nix
+6 -1
View File
@@ -5,7 +5,12 @@ let
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" {
preferLocalBuild = true;
passthru = {
isLLVM = true;
};
} ''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
pkgs/development/compilers/llvm/11/bintools/default.nix
+6 -1
View File
@@ -5,7 +5,12 @@ let
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" {
preferLocalBuild = true;
passthru = {
isLLVM = true;
};
} ''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
pkgs/development/compilers/llvm/12/bintools/default.nix
+6 -1
View File
@@ -5,7 +5,12 @@ let
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" {
preferLocalBuild = true;
passthru = {
isLLVM = true;
};
} ''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
pkgs/development/compilers/llvm/13/bintools/default.nix
+6 -1
View File
@@ -5,7 +5,12 @@ let
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" {
preferLocalBuild = true;
passthru = {
isLLVM = true;
};
} ''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
pkgs/development/compilers/llvm/14/bintools/default.nix
+6 -1
View File
@@ -5,7 +5,12 @@ let
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" {
preferLocalBuild = true;
passthru = {
isLLVM = true;
};
} ''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
pkgs/development/compilers/llvm/7/bintools/default.nix
+6 -1
View File
@@ -5,7 +5,12 @@ let
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" {
preferLocalBuild = true;
passthru = {
isLLVM = true;
};
} ''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
pkgs/development/compilers/llvm/8/bintools/default.nix
+6 -1
View File
@@ -5,7 +5,12 @@ let
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" {
preferLocalBuild = true;
passthru = {
isLLVM = true;
};
} ''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
pkgs/development/compilers/llvm/9/bintools/default.nix
+6 -1
View File
@@ -5,7 +5,12 @@ let
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" {
preferLocalBuild = true;
passthru = {
isLLVM = true;
};
} ''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
pkgs/development/compilers/llvm/git/bintools/default.nix
+6 -1
View File
@@ -5,7 +5,12 @@ let
if stdenv.hostPlatform != stdenv.targetPlatform
then "${stdenv.targetPlatform.config}-"
else "";
in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
in runCommand "llvm-binutils-${version}" {
preferLocalBuild = true;
passthru = {
isLLVM = true;
};
} ''
mkdir -p $out/bin
for prog in ${lld}/bin/*; do
ln -s $prog $out/bin/${prefix}$(basename $prog)
pkgs/development/libraries/CGAL/4.nix
+1
View File
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
};
patches = [
./cgal_path.patch
# Pull upstream fix for c++17 (gcc-12):
# https://github.com/CGAL/cgal/pull/6109
pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+3 -1
View File
@@ -305,7 +305,7 @@ diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 39f0f615cc..5f6f30f82b 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU')
@@ -200,25 +200,25 @@ if conf.has('WITH_QEMU')
endif
virt_install_dirs += [
@@ -326,6 +326,7 @@ index 39f0f615cc..5f6f30f82b 100644
- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
- runstatedir / 'libvirt' / 'qemu',
- runstatedir / 'libvirt' / 'qemu' / 'dbus',
- runstatedir / 'libvirt' / 'qemu' / 'passt',
- runstatedir / 'libvirt' / 'qemu' / 'slirp',
- runstatedir / 'libvirt' / 'qemu' / 'swtpm',
+ install_prefix + confdir / 'qemu',
@@ -345,6 +346,7 @@ index 39f0f615cc..5f6f30f82b 100644
+ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
+ install_prefix + runstatedir / 'libvirt' / 'qemu',
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus',
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'passt',
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp',
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm',
]
pkgs/development/libraries/libvirt/default.nix
+4 -4
View File
@@ -42,7 +42,7 @@
, attr ? null
, audit ? null
, dmidecode ? null
, fuse ? null
, fuse3 ? null
, kmod ? null
, libapparmor ? null
, libcap_ng ? null
@@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
# NOTE: You must also bump:
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
version = "8.10.0";
version = "9.0.0";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-MboJLQ0R3l9lUQDjNVACvmxISjypvfxxMHSKF0+k6WM=";
sha256 = "sha256-YnkgTl6C3QkvMBGm95JgWmWaP4mAECe9B0wwjOx94p8=";
fetchSubmodules = true;
};
@@ -201,7 +201,7 @@ stdenv.mkDerivation rec {
acl
attr
audit
fuse
fuse3
libapparmor
libcap_ng
libnl
pkgs/development/libraries/lucene++/default.nix
+6 -1
View File
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch";
sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo";
})
(fetchpatch {
name = "fix-visibility-on-mac.patch";
url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch";
sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4=";
})
];
postPatch = ''
@@ -47,6 +52,6 @@ stdenv.mkDerivation rec {
description = "C++ port of the popular Java Lucene search engine";
homepage = "https://github.com/luceneplusplus/LucenePlusPlus";
license = with lib.licenses; [ asl20 lgpl3Plus ];
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
};
}
pkgs/development/libraries/ogre/default.nix
+2 -2
View File
@@ -36,13 +36,13 @@
stdenv.mkDerivation rec {
pname = "ogre";
version = "13.5.3";
version = "13.6.0";
src = fetchFromGitHub {
owner = "OGRECave";
repo = "ogre";
rev = "v${version}";
sha256 = "sha256-fjgMAuIA7rm3Gt2z//kPkc7LOcfddoFgY38B7bs6zZo=";
sha256 = "sha256-yPIrF0jSeWXQ67U/QDgeQnMPvxsyaecyiW964kLsDAE=";
};
nativeBuildInputs = [
pkgs/development/libraries/vcg/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "vcg";
version = "1.0.1";
version = "2022.02";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "vcglib";
rev = "v${version}";
sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f";
rev = version;
sha256 = "sha256-XCjbVlgE0C9UagPj4fraA7BNsM6ONKo66aKQ87gQOfE=";
};
propagatedBuildInputs = [ eigen ];
pkgs/development/python-modules/bottleneck/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "bottleneck";
version = "1.3.5";
version = "1.3.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Bottleneck";
inherit version;
hash = "sha256-LA0nr+RTUfb0IYkzYmIYBPp96hT+KaeOqlLUMj9kbec=";
hash = "sha256-vBXiVF1CgtbyUpWX3xvW5MXwxEKWs/hCW8g1MFvZQ8k=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/dcmstack/default.nix
+13 -15
View File
@@ -1,34 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonAtLeast
, nose
, pythonOlder
, pytestCheckHook
, nibabel
, pydicom
, pylibjpeg-libjpeg
}:
buildPythonPackage rec {
pname = "dcmstack";
version = "0.8";
disabled = pythonAtLeast "3.8";
# https://github.com/moloney/dcmstack/issues/67
version = "0.9";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "moloney";
repo = pname;
rev = "v${version}";
sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p";
rev = "refs/tags/v${version}";
hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs=";
};
propagatedBuildInputs = [ nibabel pydicom ];
propagatedBuildInputs = [
nibabel
pydicom
pylibjpeg-libjpeg
];
checkInputs = [ nose ];
checkPhase = ''
runHook preCheck
nosetests
runHook postCheck
'';
checkInputs = [ pytestCheckHook ];
meta = with lib; {
homepage = "https://github.com/moloney/dcmstack";
pkgs/development/python-modules/docplex/default.nix
+2 -2
View File
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "docplex";
version = "2.24.232";
version = "2.25.236";
# No source available from official repo
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Mo4Ih/2ltIonP37BDyCi0fY2bkPt2ij1F0A1Ws1sF1g=";
sha256 = "sha256-JWkUtMAROk4cePMuogx9dtyO/ihv6JAnDnXPrVD+UQ8=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/edalize/default.nix
+2 -2
View File
@@ -6,7 +6,6 @@
, pandas
, pytestCheckHook
, which
, verilog
, yosys
}:
@@ -34,12 +33,13 @@ buildPythonPackage rec {
pandas
which
yosys
verilog
];
pythonImportsCheck = [ "edalize" ];
disabledTestPaths = [
"tests/test_questa_formal.py"
"tests/test_slang.py"
"tests/test_apicula.py"
"tests/test_ascentlint.py"
"tests/test_diamond.py"
pkgs/development/python-modules/flask-restx/default.nix
+3 -3
View File
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "flask-restx";
version = "1.0.3";
version = "1.0.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -28,8 +28,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "python-restx";
repo = pname;
rev = version;
sha256 = "sha256-fodoGeVSNw4XZrVt907H20OJQIR8FlfINvEPWOkZQqI=";
rev = "refs/tags/${version}";
sha256 = "sha256-9CIAPsV0SJaBlNZZtWkqhhCJ/a1QEgbTkrCEBnuDVDo=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-org-policy/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "google-cloud-org-policy";
version = "1.5.0";
version = "1.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-fA8O/pdUNgY3dwj17D7aoHUjzaXpMmL3w0TU6A6gqHo=";
hash = "sha256-V1Fpm8P4XD0USNNG1oD6OFrOeDcJyEvYPaHcWKQhLCQ=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/libcloud/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "apache-libcloud";
version = "3.6.1";
version = "3.7.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-D6zzIGVoQwyZjaQOm7rG06DE/IDdUWdNnnlLOBRQEgw=";
sha256 = "sha256-FIqeUAaWVEMqfTSZeVTpFDTdOOv2iDLrnHXUQrPmL60=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/libvirt/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "libvirt";
version = "8.10.0";
version = "9.0.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-python";
rev = "v${version}";
sha256 = "sha256-f2ZWBNCgylKQCmbLCaJsIb5alvZDRZUWQAMOMsxwGbk=";
sha256 = "sha256-/u6sctXn4Jmn2bUl1FjjrKpHReaTg+O9LprKXx3OAyU=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/development/python-modules/moderngl_window/default.nix
+3 -3
View File
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "moderngl_window";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitHub {
owner = "moderngl";
repo = pname;
rev = version;
sha256 = "12a5nl01c9b1ww7sj7i02xa7zmlrgg8jvi8cz004hw98kjcs9li8";
rev = "refs/tags/${version}";
sha256 = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE=";
};
propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ];
pkgs/development/python-modules/oci/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.90.0";
version = "2.90.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-pDLG8w5YfjmiP5JYDWoSLC0NGTfJ2Zmkz4Ed8zAB1pY=";
hash = "sha256-8HqvJx4H4cLkAXuaEUmlOjiuYD7WmVT0Xvsktc/IfCE=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/odp-amsterdam/default.nix
+4 -3
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "odp-amsterdam";
version = "5.0.0";
version = "5.0.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "klaasnicolaas";
repo = "python-odp-amsterdam";
rev = "refs/tags/v${version}";
hash = "sha256-zVnM4KYH4R6n2y9IAaYGOZVPnc8RuT/S2bseKJBO9bg=";
hash = "sha256-gRfOZwUguQgoROnqQuQWKOgubR3wjcf7Yfje2+4+CB0=";
};
postPatch = ''
@@ -50,7 +50,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python client for getting garage occupancy in Amsterdam";
homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam";
homepage = "https://github.com/klaasnicolaas/python-odp-amsterdam";
changelog = "https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/pulumi-aws/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "5.26.0";
version = "5.27.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-2sx8a+ga77asp5onfjcGLm+3hCHdCXzFNmmgqzEJfJE=";
hash = "sha256-JNiklXAAyHFLdspglGLokmHOiffDS1I5igsmupla1Qo=";
};
sourceRoot = "${src.name}/sdk/python";
pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
+43
View File
@@ -0,0 +1,43 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, cython
, numpy
}:
buildPythonPackage rec {
pname = "pylibjpeg-libjpeg";
version = "1.3.3";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pydicom";
repo = pname;
rev = "refs/tags/v.${version}";
hash = "sha256-fv3zX+P2DWMdxPKsvSPhPCV8cDX3tAMO/h5coMHBHN8=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cython];
propagatedBuildInputs = [ numpy ];
checkInputs = [
pytestCheckHook
];
doCheck = false; # tests try to import 'libjpeg.data', which errors
pythonImportsCheck = [
"libjpeg"
];
meta = with lib; {
description = "A JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg";
homepage = "https://github.com/pydicom/pylibjpeg-libjpeg";
license = licenses.gpl3;
maintainers = with maintainers; [ bcdarwin ];
};
}
pkgs/development/python-modules/python-snap7/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "python-snap7";
version = "1.2";
version = "1.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "gijzelaerr";
repo = "python-snap7";
rev = "refs/tags/${version}";
hash = "sha256-xkkJE3wTqS6spwEmQ+HBY1Szao1VFoqmQ041vnAYuqQ=";
hash = "sha256-90WwgqPHsHbuQUY49cSQblN1jfoLydiG0dm1aMF/NCA=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/tcxreader/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "tcxreader";
version = "0.4.2";
version = "0.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "alenrajsp";
repo = "tcxreader";
rev = "v${version}";
hash = "sha256-YJDuyInO5FCIdz7xE29qOpuH6rPKvO4FZChjgXdc+Aw=";
hash = "sha256-UJ6F+GcdF0b2gALQWepLyCnWm+6RKBRnBt1eJNoRRzo=";
};
checkInputs = [
pkgs/development/python-modules/textual/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "textual";
version = "0.9.1";
version = "0.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "Textualize";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-a32H5X3VsfYuU1TkOH5uGn1eDLvGUDI6WhXEQ0AKwq8=";
sha256 = "sha256-T71Jmgj/hgLOcSHu5QyqdZ7dYpLjhTQqDBdQgiaGXA8=";
};
nativeBuildInputs = [
pkgs/development/python-modules/xmldiff/default.nix
+16 -5
View File
@@ -1,24 +1,35 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, lxml
, setuptools
, six
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "xmldiff";
version = "2.4";
version = "2.5";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Bb6iDOHyyWeGg7zODDupmB+H2StwnRkOAYvL8Efsz2M=";
sha256 = "sha256-bF8wvGXOboHZpwo8sCafe6YYUv1sqnoPv8Dt8zs8txc=";
};
propagatedBuildInputs = [ lxml setuptools six ];
propagatedBuildInputs = [
lxml
setuptools
];
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"xmldiff"
];
meta = with lib; {
description = "Creates diffs of XML files";
pkgs/development/python-modules/ytmusicapi/default.nix
+3 -3
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "ytmusicapi";
version = "0.24.1";
version = "0.25.0";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-8NYutkZwR8tQzsVzYsOo6HdkiZ6WbIconDjcOwgs3PM=";
hash = "sha256-hpX/qmRRwvCE0N5jIWl6AZkcYaVViK30nPbJwyZD+rM=";
};
nativeBuildInputs = [
pkgs/development/python-modules/zope_filerepresentation/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "zope.filerepresentation";
version = "5.0.0";
version = "6.0";
src = fetchPypi {
inherit pname version;
sha256 = "1mp2r80v6ns92j089l7ngh8l9fk95g2661vkp4vqw7c71irs9g1z";
sha256 = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs=";
};
propagatedBuildInputs = [ zope_interface zope_schema ];
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
let
version = "15.7.2";
version = "15.8.0";
in
buildGoModule rec {
inherit version;
@@ -17,13 +17,13 @@ buildGoModule rec {
# For patchShebangs
buildInputs = [ bash ];
vendorSha256 = "sha256-lZAESAJ7ZRjHW6MD/xm3rOczK0h8EfmRAAVxRbVLu/k=";
vendorSha256 = "sha256-YHBp6Grm+atGne/5Ia/1H2xQRODmfWsMGCqHAIE9P4k=";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "sha256-NiBQQ36F8aYi1Uk3P0UgBy4Pai6Coz3oQDvWWOGGQNw=";
sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g=";
};
patches = [
pkgs/development/tools/misc/seer/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "seer";
version = "1.11";
version = "1.14";
src = fetchFromGitHub {
owner = "epasveer";
repo = "seer";
rev = "v${version}";
sha256 = "sha256-HIRNCcE1EhxsiJ5/MQZgR7IXaeM4rWoepPhALXoW7Hw=";
sha256 = "sha256-IxFG+OhRhPRPSyGFJh559Tz2E7aMOtpphm9GbYS0dRA=";
};
preConfigure = ''
pkgs/development/tools/ruff/default.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.226";
version = "0.0.227";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1JLzDkwcC1EnJfJ03h3NZT+NxKMzhmCsDY2ATjgqM8w=";
sha256 = "sha256-tV8a90wTTU6/4StpGAgVvdmrmSFo/GGzyecUsMhM6Nk=";
};
cargoSha256 = "sha256-JK89z52fMV3BC2UO90F2j5fV5Skp7yN0vtTf4YOHnVs=";
cargoSha256 = "sha256-S3mbXlsQsJQpJNbJHfvXHH/mQJUNz0V0cENZi3ciF/s=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
pkgs/development/tools/rust/cargo-generate/default.nix
+3 -3
View File
@@ -11,19 +11,19 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
version = "0.17.5";
version = "0.17.6";
src = fetchFromGitHub {
owner = "cargo-generate";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "sha256-VKhlPg4H04HdfIgXCXx560oFRwxPotGnGfczZ8PfVog=";
sha256 = "sha256-SDcJmEh4DBxe6icKom559B8tkvl0dbXUeACwH69PZRM=";
};
# patch Cargo.toml to not vendor libgit2 and openssl
cargoPatches = [ ./no-vendor.patch ];
cargoSha256 = "sha256-TbmivH9LXwESpqk2RFEZYZRDlLyuAyek8JxQEROsPYs=";
cargoSha256 = "sha256-wbovccAWeAPa8xbVhM2TGiLcqQYGBvGnS5/05672QKU=";
nativeBuildInputs = [ pkg-config ];
pkgs/development/tools/rust/cargo-generate/no-vendor.patch
+2 -2
View File
@@ -4,8 +4,8 @@
[dependencies]
clap = { version = "4.0", features = ["derive", "std", "help"], default-features = false }
-git2 = { version = "0.15", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false }
+git2 = { version = "0.15", features = ["ssh", "https"], default-features = false }
-git2 = { version = "0.16", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false }
+git2 = { version = "0.16", features = ["ssh", "https"], default-features = false }
console = "0.15"
dialoguer = "0.10"
dirs = "4.0"
pkgs/development/tools/rust/cargo-lock/default.nix
+3 -3
View File
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-lock";
version = "8.0.2";
version = "8.0.3";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-I64LXY8e8ztICS6AKfrNr/7Ntap7ESjindNWEeny6ZA=";
sha256 = "sha256-Xh39gaiTC3g1FHVWqUr8PR/MzeoRaGlCmGZZZnHB4Kc=";
};
cargoSha256 = "sha256-Yy7KQvPeyw5YSzUmoxUJAueVzkfQqDPE1j2+L+KifpU=";
cargoSha256 = "sha256-gf9KDzGKjZt4p5ldZShH4lOwrieJeI2WJQ8hU4hhGJE=";
buildFeatures = [ "cli" ];
pkgs/development/tools/rust/cargo-watch/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-watch";
version = "8.1.2";
version = "8.3.0";
src = fetchFromGitHub {
owner = "passcod";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zhOYKvsCK5am4Ystt3+cPAQM77IlIBJysAEix5cXKbI=";
sha256 = "sha256-2keI5hTWglqh+mLeGzRCxpfnUt6kur0I9fefYwZr5l4=";
};
cargoSha256 = "sha256-OAOzrGS8n0jfUiQyIAHWLJMEkRINyasgkIjiLw977LE=";
cargoHash = "sha256-kR12j0Z7nXfwh9nPT35/LpkK56a8D1gvVkl9/2s6rIQ=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ];
pkgs/games/factorio/versions.json
+12 -12
View File
@@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.74.tar.xz",
"name": "factorio_alpha_x64-1.1.76.tar.xz",
"needsAuth": true,
"sha256": "0ygnqlw92gz2s2c4pdhb11lvh86d7byhw5l3qw1fjsx0xv3qnxrs",
"sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.74/alpha/linux64",
"version": "1.1.74"
"url": "https://factorio.com/get-download/1.1.76/alpha/linux64",
"version": "1.1.76"
},
"stable": {
"name": "factorio_alpha_x64-1.1.74.tar.xz",
@@ -20,12 +20,12 @@
},
"demo": {
"experimental": {
"name": "factorio_demo_x64-1.1.69.tar.xz",
"name": "factorio_demo_x64-1.1.76.tar.xz",
"needsAuth": false,
"sha256": "08nakf6f31dra3rzv2l57pnww04i4ppil6c3vvvhjcv8j35b5k29",
"sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.69/demo/linux64",
"version": "1.1.69"
"url": "https://factorio.com/get-download/1.1.76/demo/linux64",
"version": "1.1.76"
},
"stable": {
"name": "factorio_demo_x64-1.1.69.tar.xz",
@@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.74.tar.xz",
"name": "factorio_headless_x64-1.1.76.tar.xz",
"needsAuth": false,
"sha256": "1lqxprmai3vrm3hf9zdj9c9c6w05086nzn0vy88zy7xm2dgw7ylv",
"sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.74/headless/linux64",
"version": "1.1.74"
"url": "https://factorio.com/get-download/1.1.76/headless/linux64",
"version": "1.1.76"
},
"stable": {
"name": "factorio_headless_x64-1.1.74.tar.xz",
pkgs/games/steam/fhsenv.nix
+1
View File
@@ -97,6 +97,7 @@ in buildFHSUserEnv rec {
libdrm
libxkbcommon # paradox launcher
libvorbis # Dead Cells
libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2
mono
xorg.xkeyboardconfig
xorg.libpciaccess
pkgs/os-specific/linux/cryptodev/default.nix
+5 -3
View File
@@ -14,9 +14,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
INSTALL_MOD_PATH = "\${out}";
prefix = "\${out}";
makeFlags = kernel.makeFlags ++ [
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
"prefix=$(out)"
];
meta = {
description = "Device that allows access to Linux kernel cryptographic drivers";
pkgs/os-specific/linux/firejail/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "firejail";
version = "0.9.70";
version = "0.9.72";
src = fetchFromGitHub {
owner = "netblue30";
repo = "firejail";
rev = version;
sha256 = "sha256-x1txt0uER66bZN6BD6c/31Zu6fPPwC9kl/3bxEE6Ce8=";
sha256 = "sha256-XAlb6SSyY2S1iWDaulIlghQ16OGvT/wBCog95/nxkog=";
};
nativeBuildInputs = [
pkgs/os-specific/linux/open-iscsi/default.nix
+41 -36
View File
@@ -1,55 +1,60 @@
{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext
, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf, nixosTests
}:
{ stdenv
, lib
, fetchFromGitHub
, meson
, pkg-config
, ninja
, perl
, util-linux
, open-isns
, openssl
, kmod
, systemd
, runtimeShell
, nixosTests }:
stdenv.mkDerivation rec {
pname = "open-iscsi";
version = "2.1.7";
nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
buildInputs = [ kmod open-isns.lib openssl systemd util-linux ];
version = "2.1.8";
src = fetchFromGitHub {
owner = "open-iscsi";
repo = "open-iscsi";
rev = version;
sha256 = "sha256-R1ttHHxVSQ5TGtWVy4I9BAmEJfcRhKRD5jThoeddjUw=";
hash = "sha256-JzSyX9zvUkhCEpNwTMneTZpCRgaYxHZ1wP215YnMI78=";
};
DESTDIR = "$(out)";
NIX_LDFLAGS = "-lkmod -lsystemd";
NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
nativeBuildInputs = [
meson
pkg-config
ninja
perl
];
buildInputs = [
kmod
(lib.getLib open-isns)
openssl
systemd
util-linux
];
preConfigure = ''
# Remove blanket -Werror. Fails for minor error on gcc-11.
substituteInPlace usr/Makefile --replace ' -Werror ' ' '
patchShebangs .
'';
# avoid /usr/bin/install
makeFlags = [
"INSTALL=install"
"SED=sed"
"prefix=/"
"manprefix=/share"
prePatch = ''
substituteInPlace etc/systemd/iscsi-init.service.template \
--replace /usr/bin/sh ${runtimeShell}
sed -i '/install_dir: db_root/d' meson.build
'';
mesonFlags = [
"-Discsi_sbindir=${placeholder "out"}/sbin"
"-Drulesdir=${placeholder "out"}/etc/udev/rules.d"
"-Dsystemddir=${placeholder "out"}/lib/systemd"
"-Ddbroot=/etc/iscsi"
];
installFlags = [
"install"
];
postInstall = ''
cp usr/iscsistart $out/sbin/
for f in $out/lib/systemd/system/*; do
substituteInPlace $f --replace /sbin $out/bin
done
$out/sbin/iscsistart -v
'';
postFixup = ''
sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login
'';
passthru.tests = { inherit (nixosTests) iscsi-root iscsi-multipath-root; };
meta = with lib; {
pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "raspberrypi-eeprom";
version = "2022.12.07-138a1";
version = "2023.01.11-138c0";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
rev = "v${version}";
hash = "sha256-/Q9zj/Hn/8S7bF1CN6ZCg705VYU+QUagNr4RNgZl+oA=";
hash = "sha256-z3VyqdSkvxAgVmtMI/Is9qYrOeDXlyVLwHSSC2+AxcA=";
};
buildInputs = [ python3 ];
pkgs/servers/adguardhome/bins.nix
+10 -10
View File
@@ -1,23 +1,23 @@
{ fetchurl, fetchzip }:
{
x86_64-darwin = fetchzip {
sha256 = "sha256-ViWbvpGU6mk9N8Nstn0urZrcd8JIPs9Ok9806+vUvy0=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_darwin_amd64.zip";
sha256 = "sha256-grxGXMskjpNHcL61xgX02ouxFodxnzuhORby0wcZM7E=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_darwin_amd64.zip";
};
aarch64-darwin = fetchzip {
sha256 = "sha256-ixfeTi2Y44Om7RCKZOw3oJX+FiwTT+s7MSSqowyNKUU=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_darwin_arm64.zip";
sha256 = "sha256-J98fqxPlr8XZMll63GC5G8SvzOS6egViHATKSKCfYQ4=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_darwin_arm64.zip";
};
i686-linux = fetchurl {
sha256 = "sha256-EZzZ8Z6N+wctI/ncLjIAvFgQN1YWOnywhihxF+C6MOs=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_linux_386.tar.gz";
sha256 = "sha256-09HyY9WL2vzA5L0nDG/ByHs/fWj+GiJUy3Rq9yWd4Ak=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_linux_386.tar.gz";
};
x86_64-linux = fetchurl {
sha256 = "sha256-xU5PxscqBEGNCgA241UbhJcxlNXpCxbFeU7bfmSqf7I=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_linux_amd64.tar.gz";
sha256 = "sha256-1mFOlerwTOLUQGiVX1nyFfMC1vl7W0c+P/xnPjNTrYE=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_linux_amd64.tar.gz";
};
aarch64-linux = fetchurl {
sha256 = "sha256-ajhvvxYwttEaCQXL4WaDcjzk8g0krhIXJv5VHEEdfqg=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_linux_arm64.tar.gz";
sha256 = "sha256-eoITV5oAyGJBn607lfJgH/1C0dHkoEIvk3x6rKxKn+k=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_linux_arm64.tar.gz";
};
}
pkgs/servers/adguardhome/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ in
stdenv.mkDerivation rec {
pname = "adguardhome";
version = "0.107.21";
version = "0.107.22";
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
installPhase = ''
pkgs/servers/dns/pdns-recursor/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "pdns-recursor";
version = "4.8.0";
version = "4.8.1";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
sha256 = "zLkBehp4jpXpSOeyQO+NtTropQe5FfJgGI7zQ/f2i9w=";
sha256 = "17A0RwCSV+US8B/MRsvbnIWbZyocmyP684LocHZbDw0=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "check_ssl_cert";
version = "2.57.0";
version = "2.58.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "v${version}";
hash = "sha256-N+VkdVeJ6UdRPFUFmIpZoL/Mc8MkTd+hAPjha5pimt8=";
hash = "sha256-nQE3UMZcIR063JuZkTN49imDYQGGnNzE1yaeR4k4mWY=";
};
nativeBuildInputs = [
pkgs/servers/monitoring/unpoller/default.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "unpoller";
version = "2.4.1";
version = "2.7.10";
src = fetchFromGitHub {
owner = "unpoller";
repo = "unpoller";
rev = "v${version}";
hash = "sha256-t4f7iAIOg19n1aKG0tQy/GHNXdVAEnaRyTXMZY+1IUw=";
hash = "sha256-zwrVMQI/zn+UtaXZyZr1wGkBP/KKDKvE/YjLR5rbK0o=";
};
vendorHash = "sha256-GUzMu3ltdmFCKKWi9Hlr39rNe5uPnZpwQfhVAHtbeiw=";
vendorHash = "sha256-SjZQnVG7j2zbPCr4AeF9vZkmd7eEocmnCQKFH09qSng=";
ldflags = [
"-w" "-s"
pkgs/servers/nosql/apache-jena/binary.nix
+2 -2
View File
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "apache-jena";
version = "4.6.1";
version = "4.7.0";
src = fetchurl {
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
sha256 = "sha256-XCExqN0S5aIeLUNkAXjBHPW/fvj+MxQP3GEOP9gSdLE=";
sha256 = "sha256-3tJRJ9UHsOYfWvwPZHp+hkRZxb0RODchJjQMAZ3lkuY=";
};
nativeBuildInputs = [
makeWrapper
pkgs/servers/sftpgo/default.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "sftpgo";
version = "2.4.2";
version = "2.4.3";
src = fetchFromGitHub {
owner = "drakkan";
repo = "sftpgo";
rev = "refs/tags/v${version}";
hash = "sha256-bI4IiYzVorocITkip+Xev3t7vGeMVmqCZn7oR1mAPpI=";
hash = "sha256-cSA7ndpIV3VvIZTBa9NCIlJn57EtT1qxrB0UsMENUS0=";
};
vendorHash = "sha256-+i6jUImDMrsDnIPjIp8uM2BR1IYMqWG1OmvA2w/AfVQ=";
vendorHash = "sha256-C45KA+9tdj+fR3DUBLdG2dGzT59zuAJczpKVoiAZ7lg=";
ldflags = [
"-s"
pkgs/servers/teleport/default.nix
+7 -7
View File
@@ -23,13 +23,13 @@ let
owner = "gravitational";
repo = "teleport";
rev = "v${version}";
hash = "sha256-F5v3/eKPLhSxW7FImTbE+QMtfn8w5WVTrxMWhgNr3YA=";
hash = "sha256-8S+r5pd8icOljGkxqLsZKmh4+nIwPQErs7RK88q0vOQ=";
};
version = "10.3.1";
version = "11.1.4";
rdpClient = rustPlatform.buildRustPackage rec {
pname = "teleport-rdpclient";
cargoHash = "sha256-Xmabjoq1NXxXemeR06Gg8R/HwdSE+rsxxX645pQ3SuI=";
cargoHash = "sha256-XuJTdpb2eIeXnVtuSOlHjZQ8PpwxK4/4siK2S2h6xIw=";
inherit version src;
buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";
@@ -53,16 +53,16 @@ let
webassets = fetchFromGitHub {
owner = "gravitational";
repo = "webassets";
# Submodule rev from https://github.com/gravitational/teleport/tree/v10.3.1
rev = "6710dcd0dc19ad101bac3259c463ef940f2ab1f3";
hash = "sha256-A13FSpgJODmhugAwy4kqiDw4Rihr//DhQX/bjwaeo2A=";
# Submodule rev from https://github.com/gravitational/teleport/tree/v11.1.4
rev = "5f2597d5987804d37e61da8ae9d1a5a2d6b43ef4";
hash = "sha256-meRinI4VsJuRoJznVULHL38bUIu352lf5LRPLlef1OA=";
};
in
buildGoModule rec {
pname = "teleport";
inherit src version;
vendorHash = "sha256-2Zrd3CbZvxns9lNVtwaaor1mi97IhPc+MRJhj3rU760=";
vendorHash = "sha256-nlwBjeh0BlZ3vUQxvaYW0aK5Y2YK1gEar9s1IMJJEMY=";
subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ];
tags = [ "libfido2" "webassets_embed" ]
pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix
+3 -3
View File
@@ -4,10 +4,10 @@
mkPulumiPackage rec {
owner = "pulumi";
repo = "pulumi-azure-native";
version = "1.85.0";
version = "1.92.0";
rev = "v${version}";
hash = "sha256-12JjDHYCxx/eQBIGpMO9FnjYFu54QT80zvivDYiHWjM=";
vendorHash = "sha256-RhZBvFjleVxskFcuNZcjcq9Hc+bLfBL9PsZg5rIPJ3Y=";
hash = "sha256-eSHD7ckiHJJoqJFeSlwxl063QRRTtiWdpu1m9OVRhoA=";
vendorHash = "sha256-DI92fCe8HPwjERkBVlOebZpvCreq9850OeERDkiayz8=";
cmdGen = "pulumi-gen-azure-native";
cmdRes = "pulumi-resource-azure-native";
extraLdflags = [
pkgs/tools/graphics/pikchr/default.nix
+6 -5
View File
@@ -1,16 +1,17 @@
{ lib
, stdenv
, fetchurl
, fetchfossil
}:
stdenv.mkDerivation {
pname = "pikchr";
# To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk
version = "unstable-2022-06-20";
version = "unstable-2022-12-07";
src = fetchurl {
url = "https://pikchr.org/home/tarball/d9ee756594b6eb64/pikchr.tar.gz";
sha256 = "sha256-ML+gymFrBay1kly7NYsxo0I1qNMoZPzNI3ClBTrWlHw=";
src = fetchfossil {
url = "https://pikchr.org/home";
rev = "21ca6b843d65c404";
sha256 = "sha256-fp06GqpLa/szRCS54KJ+SkT602oWvK3KyDFFjTmpNfI=";
};
# can't open generated html files
pkgs/tools/misc/gsmartcontrol/default.nix
+8 -4
View File
@@ -1,18 +1,22 @@
{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }:
stdenv.mkDerivation rec {
version="1.1.3";
pname = "gsmartcontrol";
version = "1.1.4";
src = fetchurl {
url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn";
url = "https://github.com/ashaduri/gsmartcontrol/releases/download/v${version}/gsmartcontrol-${version}.tar.bz2";
sha256 = "sha256-/ECfK4qEzEC7ED1sgkAbnUwBgtWjsiPJOVnHrWYZGEc=";
};
patches = [
./fix-paths.patch
];
postPatch = ''
substituteInPlace data/org.gsmartcontrol.policy --replace "/usr/sbin" $out/bin
'';
nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ];
buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ];
@@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
It allows you to inspect the drive's SMART data to determine its health,
as well as run various tests on it.
'';
homepage = "https://gsmartcontrol.sourceforge.io/";
homepage = "https://gsmartcontrol.shaduri.dev/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [qknight];
platforms = with lib.platforms; linux;
pkgs/tools/misc/gsmartcontrol/fix-paths.patch
-25
View File
@@ -1,14 +1,3 @@
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -475,6 +475,7 @@
AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \
+ data/org.gsmartcontrol.policy \
data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \
debian.dist/changelog \
src/gsc_winres.rc src/gsmartcontrol.exe.manifest \
diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in
--- a/data/gsmartcontrol-root.in
+++ b/data/gsmartcontrol-root.in
@@ -30,20 +19,6 @@ diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in
export PATH="$EXTRA_PATHS:$PATH"
diff --git a/data/org.gsmartcontrol.policy b/data/org.gsmartcontrol.policy.in
rename from data/org.gsmartcontrol.policy
rename to data/org.gsmartcontrol.policy.in
--- a/data/org.gsmartcontrol.policy
+++ b/data/org.gsmartcontrol.policy.in
@@ -12,7 +12,7 @@
<allow_inactive>auth_admin</allow_inactive>
<allow_active>auth_admin</allow_active>
</defaults>
- <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gsmartcontrol</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">@prefix@/bin/gsmartcontrol</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
pkgs/tools/misc/onefetch/default.nix
+3 -12
View File
@@ -1,7 +1,6 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, cmake
, installShellFiles
, pkg-config
@@ -15,30 +14,22 @@
rustPlatform.buildRustPackage rec {
pname = "onefetch";
version = "2.14.2";
version = "2.15.1";
src = fetchFromGitHub {
owner = "o2sh";
repo = pname;
rev = version;
sha256 = "sha256-LiX91GMJdmhosCZcL3JlzYRieqeQs+YWMAtKTzSBzZY=";
sha256 = "sha256-3wXZBPYths3+Vhtq4W2BTR47V63o0bq++fWLIpWrm7Y=";
};
cargoSha256 = "sha256-D1GVwNpuqoiwJsWAZfTR9qUC1xuHR+O0bq9rxmgkYXk=";
cargoSha256 = "sha256-xBw2OMJMale4MWRyy6v0E0ZE4A98QXLyRu0k7L+9q8k=";
cargoPatches = [
# enable pkg-config feature of zstd
./zstd-pkg-config.patch
];
patches = [
(fetchpatch {
name = "use-iso-time-for-snapshot-tests";
url = "https://github.com/o2sh/onefetch/commit/b8b0320d2d271bb10053403092833a26e57134d1.patch";
hash = "sha256-LnC+UCvSwMePC4jBjrTKnbyypNvHHNevB2v4y+hv8Pc=";
})
];
nativeBuildInputs = [ cmake installShellFiles pkg-config ];
buildInputs = [ zstd ]
pkgs/tools/networking/fdm/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fdm";
version = "2.1";
version = "2.2";
src = fetchFromGitHub {
owner = "nicm";
repo = pname;
rev = version;
sha256 = "sha256-w7jgFq/uWGTF8+CsQCwXKu3eJ7Yjp1WWY4DGQhpBFmQ=";
sha256 = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0=";
};
nativeBuildInputs = [ autoreconfHook ];
pkgs/tools/security/trufflehog/default.nix
+4 -4
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.24.0";
version = "3.25.2";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-MFGOw7SuTCf4no5iUxppaNjsDvhsuQQXcXutE3L7iRk=";
hash = "sha256-0cYaW55BF05tXCci76Eivn2rHMMJdjXl5WUkxvXbbnk=";
};
vendorHash = "sha256-UqoFEvixSk42UTMswc8tUDVxYVkfgkern3NeDyiUMMw=";
@@ -27,7 +27,7 @@ buildGoModule rec {
description = "Find credentials all over the place";
homepage = "https://github.com/trufflesecurity/trufflehog";
changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/v${version}";
license = with licenses; [ agpl3 ];
maintainers = with maintainers; [ ];
license = with licenses; [ agpl3Only ];
maintainers = with maintainers; [ fab ];
};
}
pkgs/tools/text/d2/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "d2";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "terrastruct";
repo = pname;
rev = "v${version}";
hash = "sha256-z7R3lseEPWtBl5wjpMK8okQG31L1k2R/+B9M25TrI6s=";
hash = "sha256-bPEEL4t5R/2DnO1IKaTV5NIfT+RL9MVRuoBLlsSPJgM=";
};
vendorHash = "sha256-t94xCNteYRpbV2GzrD4ppD8xfUV1HTJPkipEzr36CaM=";
vendorHash = "sha256-IKISxtAo9zKV6nLGAUNjtNb/YzRK2QO7Wa4RSNthzPU=";
ldflags = [
"-s"
pkgs/tools/text/poedit/default.nix
+5 -3
View File
@@ -1,10 +1,10 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30,
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK32,
boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml,
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "poedit";
version = "3.1.1";
version = "3.2.2";
src = fetchFromGitHub {
owner = "vslavik";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
libxslt xmlto boost libtool pkg-config ];
buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ];
buildInputs = [ lucenepp nlohmann_json wxGTK32 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ];
propagatedBuildInputs = [ gettext ];
@@ -45,5 +45,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ dasj19 ];
# configure: error: GTK+ build of wxWidgets is required
broken = stdenv.isDarwin;
};
}
pkgs/top-level/all-packages.nix
+8 -2
View File
@@ -2862,6 +2862,8 @@ with pkgs;
inherit (nodePackages) bitwarden-cli;
bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { };
inherit (nodePackages) concurrently;
bklk = callPackage ../applications/misc/bklk { };
@@ -7767,7 +7769,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
graphviz-nox = graphviz.override {
graphviz-nox = callPackage ../tools/graphics/graphviz {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
withXorg = false;
libdevil = libdevil-nox;
};
@@ -10288,6 +10291,8 @@ with pkgs;
openmvg = callPackage ../applications/science/misc/openmvg { };
openmvs = callPackage ../applications/science/misc/openmvs { };
openntpd = callPackage ../tools/networking/openntpd { };
openntpd_nixos = openntpd.override {
@@ -10850,7 +10855,7 @@ with pkgs;
pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
poedit = callPackage ../tools/text/poedit {
wxGTK30 = wxGTK30.override { withWebKit = true; };
wxGTK32 = wxGTK32.override { withWebKit = true; };
};
polaris = callPackage ../servers/polaris { };
@@ -20688,6 +20693,7 @@ with pkgs;
};
libdevil-nox = libdevil.override {
inherit (darwin.apple_sdk.frameworks) OpenGL;
withXorg = false;
};
pkgs/top-level/perl-packages.nix
+2 -2
View File
@@ -22646,12 +22646,12 @@ let
SysVirt = buildPerlModule rec {
pname = "Sys-Virt";
version = "8.10.0";
version = "9.0.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-perl";
rev = "v${version}";
hash = "sha256-rVTofRtnYDF5CmWp3SB2+kJZz4u6+OTzNAUwiDrqdTo=";
hash = "sha256-QiaB272kxs/Y3/l8KbFy8f9iyOCxhzfA/h2FnfGzmE4=";
};
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];

Some files were not shown because too many files have changed in this diff Show More