diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-12 16:02:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-12 16:02:45 +0000 |
| commit | 87f957b5e23490bda6e86bbe1f2e61e4358bfeff (patch) | |
| tree | 0dd97beb61f482875bf3f1926d011483a24eedca | |
| parent | binutils: try to move headers around only when --host/--target differ (#215989) (diff) | |
| parent | Merge pull request #215751 from Artturin/gccaddcallfile (diff) | |
| download | nixpkgs-87f957b5e23490bda6e86bbe1f2e61e4358bfeff.tar.gz | |
Merge master into staging-next
35 files changed, 1155 insertions, 1154 deletions
diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index cf5ac3f8c52e..e08400220790 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -10,18 +10,18 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-iinEo+HrcNM3gx1iUqe1duRd45PrYgVybRt9NKphwuY="; + hash = "sha256-IXB5eOXVtoe21WbQa9x5SKcgUpgyjVx48998vdccMPM="; }; deleteVendor = true; - vendorHash = "sha256-DbdAEvcspTYMYMvc5IBEUtQAJMW8JZpNi0UA/DvzGFo="; + vendorHash = null; subPackages = [ "cmd/musicfox.go" ]; diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 0860501c87c4..71fc1f103b9b 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -1,4 +1,4 @@ -{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3 }: +{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3, nix-update-script }: buildNpmPackage rec { pname = "open-stage-control"; @@ -71,7 +71,7 @@ buildNpmPackage rec { }) ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Libre and modular OSC / MIDI controller"; diff --git a/pkgs/applications/audio/open-stage-control/update.sh b/pkgs/applications/audio/open-stage-control/update.sh deleted file mode 100755 index 30f1b4c293f1..000000000000 --- a/pkgs/applications/audio/open-stage-control/update.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p common-updater-scripts jq nodejs -set -euo pipefail - -# Find nixpkgs repo -nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" - -stripwhitespace() { - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -} - -nixeval() { - nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . -} - -vendorhash() { - (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true -} - -findpath() { - path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" - outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" - - if [ -n "$outpath" ]; then - path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" - fi - - echo "$path" -} - -attr="${UPDATE_NIX_ATTR_PATH:-open-stage-control}" -version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)" - -pkgpath="$(findpath "$attr")" - -updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" - -if [ "$updated" -eq 0 ]; then - echo 'update.sh: Package version not updated, nothing to do.' - exit 0 -fi - -# Update FOD hash -curhash="$(nixeval "$attr.npmDeps.outputHash")" -newhash="$(vendorhash "$attr.npmDeps")" - -if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then - sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" -else - echo 'update.sh: New npmDepsHash same as old npmDepsHash, nothing to do.' -fi diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 6d13063bd056..fb9b6a1d11ac 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-ZG10ruusSywXWn88UqrHVfAWrio2KoK2YoM9qdtMlhU="; + hash = "sha256-qNSnO+wtAKyUJwjIMZaiBUfgaoDFVttp04kTxr4H6po="; }; - vendorHash = "sha256-Tqn5HGhRbN++yAo9JajUMTxFjVLw5QTvsis8wcfRIHw="; + vendorHash = "sha256-75l4YCYC38uX63Uv/MA7HciQ+wumWhTuimL+ctizBCs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 19aaa36c7eb6..ebb28798f55e 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.13"; + version = "0.31.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; + sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8="; }; vendorSha256 = null; diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 3224696a5e33..abe6d92cd0a6 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -24,7 +24,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , libxcrypt }: @@ -83,6 +83,67 @@ let majorVersion = "10"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc10.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + libxcrypt + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -158,39 +219,12 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - inherit (import ../common/dependencies.nix { - inherit - lib - stdenv - buildPackages - targetPackages - crossStageStatic - threadsCross - langAda - libxcrypt - gnatboot - version - texinfo - which - gettext - gnused - patchelf - gmp - mpfr - libmpc - isl - zlib - zip - perl - ; - }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = (import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }) + '' + preConfigure = (callFile ../common/pre-configure.nix { }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -198,32 +232,7 @@ stdenv.mkDerivation ({ configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -231,8 +240,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -255,10 +263,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -272,24 +277,17 @@ stdenv.mkDerivation ({ inherit enableMultilib enableShared; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; + } // optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index e4dab5f263dc..8c11c1711123 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -89,6 +89,67 @@ let majorVersion = "11"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc11.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + libxcrypt + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -164,39 +225,12 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - inherit (import ../common/dependencies.nix { - inherit - lib - stdenv - buildPackages - targetPackages - crossStageStatic - threadsCross - langAda - libxcrypt - gnatboot - version - texinfo - which - gettext - gnused - patchelf - gmp - mpfr - libmpc - isl - zlib - zip - perl - ; - }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = (import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }) + '' + preConfigure = (callFile ../common/pre-configure.nix { }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -204,32 +238,7 @@ stdenv.mkDerivation ({ configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -237,8 +246,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -261,10 +269,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -278,22 +283,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; }; } diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 621da8f1bef7..f0bdafd8c208 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -123,6 +123,67 @@ let majorVersion = "12"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc12.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + libxcrypt + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -198,42 +259,12 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - inherit (import ../common/dependencies.nix { - inherit - lib - stdenv - buildPackages - targetPackages - crossStageStatic - threadsCross - langAda - langGo - libucontext - libxcrypt - gnatboot - version - texinfo - which - gettext - gnused - patchelf - gmp - mpfr - libmpc - isl - zlib - zip - perl - ; - }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; + inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = (import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }) + '' + preConfigure = (callFile ../common/pre-configure.nix { }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -241,32 +272,7 @@ stdenv.mkDerivation ({ configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -274,8 +280,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -298,10 +303,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -315,22 +317,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index d99e889daa11..7e6d4eb12239 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -111,6 +111,82 @@ let majorVersion = "4"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + javaEcj + javaAntlr + xlibs + javaAwtGtk + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc48.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + boehmgc + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + gtk2 + isl + langC + langCC + langFortran + langGo + langJava + langJit + langObjC + langObjCpp + lib + libICE + libSM + libX11 + libXi + libXrandr + libXrender + libXt + libXtst + libart_lgpl + libcCross threadsCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + pkg-config + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + unzip + which + x11Support + xorgproto + zip + zlib + ; + }; + in # We need all these X libraries when building AWT with GTK. @@ -158,74 +234,16 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - inherit (import ../common/dependencies.nix { - inherit - lib - stdenv - buildPackages - targetPackages - crossStageStatic - threadsCross - version - langJava - javaAwtGtk - texinfo - which - gettext - pkg-config - gnused - patchelf - gmp - mpfr - libmpc - cloog - isl - zlib - boehmgc - zip - unzip - gtk2 - libart_lgpl - perl - xlibs - ; - }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - cloog - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langJava javaAwtGtk javaAntlr javaEcj - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -233,8 +251,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -272,10 +289,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -290,22 +304,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = with lib.maintainers; [ veprbl ]; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 6dd8f975707c..4ea63d7c12e1 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -127,6 +127,82 @@ let majorVersion = "4"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + javaEcj + javaAntlr + xlibs + javaAwtGtk + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc49.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + boehmgc + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + gtk2 + isl + langC + langCC + langFortran + langGo + langJava + langJit + langObjC + langObjCpp + lib + libICE + libSM + libX11 + libXi + libXrandr + libXrender + libXt + libXtst + libart_lgpl + libcCross threadsCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + pkg-config + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + unzip + which + x11Support + xorgproto + zip + zlib + ; + }; + in # We need all these X libraries when building AWT with GTK. @@ -178,74 +254,16 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - inherit (import ../common/dependencies.nix { - inherit - lib - stdenv - buildPackages - targetPackages - crossStageStatic - threadsCross - version - langJava - javaAwtGtk - texinfo - which - gettext - pkg-config - gnused - patchelf - gmp - mpfr - libmpc - cloog - isl - zlib - boehmgc - zip - unzip - gtk2 - libart_lgpl - perl - xlibs - ; - }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - cloog - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langJava javaAwtGtk javaAntlr javaEcj - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -253,8 +271,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -292,10 +309,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -309,22 +323,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = with lib.maintainers; [ veprbl ]; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 41db37989eda..039293dd86e4 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -31,7 +31,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages }: @@ -115,6 +115,86 @@ let majorVersion = "6"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + javaEcj + javaAntlr + xlibs + javaAwtGtk + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc6.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + boehmgc + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchFromGitHub + fetchpatch + fetchurl + flex + gettext + gmp + gnatboot + gnused + gtk2 + isl + langAda + langC + langCC + langFortran + langGo + langJava + langJit + langObjC + langObjCpp + lib + libICE + libSM + libX11 + libXi + libXrandr + libXrender + libXt + libXtst + libart_lgpl + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + pkg-config + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + unzip + which + x11Support + xorgproto + zip + zlib + ; + }; in # We need all these X libraries when building AWT with GTK. @@ -193,78 +273,18 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - inherit (import ../common/dependencies.nix { - inherit - lib - stdenv - buildPackages - targetPackages - crossStageStatic - threadsCross - version - langAda - gnatboot - flex - langJava - javaAwtGtk - texinfo - which - gettext - pkg-config - gnused - patchelf - gmp - mpfr - libmpc - isl - zlib - boehmgc - zip - unzip - gtk2 - libart_lgpl - perl - xlibs - ; - }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langJava langAda langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langJava javaAwtGtk javaAntlr javaEcj - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -272,8 +292,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -311,10 +330,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -328,20 +344,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index bc61223d4c85..a02d1b6d2795 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -21,7 +21,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages }: @@ -91,6 +91,63 @@ let majorVersion = "7"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc7.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + isl + langC + langCC + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -165,66 +222,20 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - inherit (import ../common/dependencies.nix { - inherit - lib - stdenv - buildPackages - targetPackages - crossStageStatic - threadsCross - version - texinfo - which - gettext - gnused - patchelf - gmp - mpfr - libmpc - isl - zlib - zip - perl - ; - }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langGo - langObjC - langObjCpp - langJit - ; - } ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" + configureFlags = (callFile ../common/configure-flags.nix { }) + ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" ++ optional targetPlatform.isNetBSD "--disable-libcilkrts" ; @@ -234,8 +245,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -260,10 +270,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -277,22 +284,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 5bdba91b7076..b7e70f39471e 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -21,7 +21,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages }: @@ -73,6 +73,63 @@ let majorVersion = "8"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc8.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + isl + langC + langCC + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -147,65 +204,18 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - inherit (import ../common/dependencies.nix { - inherit - lib - stdenv - buildPackages - targetPackages - crossStageStatic - threadsCross - version - texinfo - which - gettext - gnused - patchelf - gmp - mpfr - libmpc - isl - zlib - zip - perl - ; - }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -213,8 +223,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -237,10 +246,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -254,22 +260,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 53945fec4613..484c89c0e902 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -84,6 +84,66 @@ let majorVersion = "9"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc9.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -158,69 +218,18 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - inherit (import ../common/dependencies.nix { - inherit - lib - stdenv - buildPackages - targetPackages - crossStageStatic - threadsCross - langAda - gnatboot - version - texinfo - which - gettext - gnused - patchelf - gmp - mpfr - libmpc - isl - zlib - zip - perl - ; - }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -228,8 +237,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -252,10 +260,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -269,22 +274,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 25e59148440a..78d13cb941e3 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -25,7 +25,6 @@ , langJit }: -assert cloog != null -> lib.versionOlder version "5"; assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] @@ -188,7 +187,7 @@ let # Optional features ++ lib.optional (isl != null) "--with-isl=${isl}" - ++ lib.optionals (cloog != null) [ + ++ lib.optionals (lib.versionOlder version "5" && cloog != null) [ "--with-cloog=${cloog}" "--disable-cloog-version-check" "--enable-cloog-backend=isl" diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix index a193ec887a0a..d3ae3e33c46c 100644 --- a/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -79,7 +79,7 @@ in ++ [ targetPackages.stdenv.cc.bintools # For linking code at run-time ] - ++ optionals (cloog != null) [ cloog ] + ++ optionals (lib.versionOlder version "5" && cloog != null) [ cloog ] ++ optionals (isl != null) [ isl ] ++ optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc zip unzip ] diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix new file mode 100644 index 000000000000..84c3dc189b1f --- /dev/null +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -0,0 +1,19 @@ +{ lib, version, }: + +with lib; { + homepage = "https://gcc.gnu.org/"; + license = licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}"; + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + platforms = platforms.unix; + maintainers = if versionOlder version "5" then [ maintainers.veprbl ] else teams.gcc.members; + +} diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index d5562d89f50f..28f13d50f784 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.14"; + version = "0.13.15"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ROSBjRvl036dslLZF5WgdBnlRvafrNaRzt65wfnk0s="; + sha256 = "sha256-UunYt5S8Xz/EZOojl+by3LaHidBE/P4Uwppm4SeHVP0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index c3d88103c2e3..fc5855702175 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.102/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.103/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 3edab9894b95..6aa97206e39c 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/attica-5.102.0.tar.xz"; - sha256 = "1xph3l4if2vv2gdv9wjk0ls38g77jdzg3j81fyng8pvxsl32z1yv"; - name = "attica-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/attica-5.103.0.tar.xz"; + sha256 = "17b0kshlgi110v42zmvbsmcjjc48rn617l4dmviwd0ycd2kgqd1s"; + name = "attica-5.103.0.tar.xz"; }; }; baloo = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/baloo-5.102.0.tar.xz"; - sha256 = "0y6xc7dihzrcmpb75p8206832kz108l6irdzjv4m0pm0qdj3kb6x"; - name = "baloo-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/baloo-5.103.0.tar.xz"; + sha256 = "1055wv29dd4i7az79q2qdk65wk5xqyslwxnwhxr30xzyp60i9smk"; + name = "baloo-5.103.0.tar.xz"; }; }; bluez-qt = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/bluez-qt-5.102.0.tar.xz"; - sha256 = "0023nhlsniqkkzqjif22fk1hrlzpmigdnc8v4v5z0qf488b0pyf3"; - name = "bluez-qt-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/bluez-qt-5.103.0.tar.xz"; + sha256 = "1w6q3cna46ifv1gvnxp45n0z8civ2cab9sjbvsc3apks6w2iahzz"; + name = "bluez-qt-5.103.0.tar.xz"; }; }; breeze-icons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/breeze-icons-5.102.0.tar.xz"; - sha256 = "1673fjh2q5388764rkkjs5v7jsswr71xdw582irwwz4zic5dkcrd"; - name = "breeze-icons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/breeze-icons-5.103.0.tar.xz"; + sha256 = "1gas85qliib44j5cfpq47hfzni38afqyf9lxkgv1d0q7y87df9br"; + name = "breeze-icons-5.103.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/extra-cmake-modules-5.102.0.tar.xz"; - sha256 = "16vz555f5dmj0prpdr9sbla44gkdmzrlb1k51qmfwip0m2sswngj"; - name = "extra-cmake-modules-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/extra-cmake-modules-5.103.0.tar.xz"; + sha256 = "0ij3kjggmil995kcjbfirwy1fis60wgj6m7jxaynz59qrdajxjlj"; + name = "extra-cmake-modules-5.103.0.tar.xz"; }; }; frameworkintegration = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/frameworkintegration-5.102.0.tar.xz"; - sha256 = "00qr6n4h8fgm3vy64plj5762wyfanglh8r8qljvpk9jll74wm01d"; - name = "frameworkintegration-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/frameworkintegration-5.103.0.tar.xz"; + sha256 = "1gljch9nrnw28ix2q2hs29rk0bfzzr4pv0m1msdr0nm1lmyr7w93"; + name = "frameworkintegration-5.103.0.tar.xz"; }; }; kactivities = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kactivities-5.102.0.tar.xz"; - sha256 = "1kl1la4a4zagy7h1sf4l0wdwzg53v28z70sv73dwd6869dmmwygr"; - name = "kactivities-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kactivities-5.103.0.tar.xz"; + sha256 = "0dc89yx89kjjvmb6jycqmyb55pml46vy7xw24myin6xfisb8nckd"; + name = "kactivities-5.103.0.tar.xz"; }; }; kactivities-stats = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kactivities-stats-5.102.0.tar.xz"; - sha256 = "06v2qrd6g20028skh9dq2csw0nggf05qh8w8nz0zvx8q2q2fszhh"; - name = "kactivities-stats-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kactivities-stats-5.103.0.tar.xz"; + sha256 = "0ga51n9c64c4mhmbw1fisbxgcmy77qzi6bhvj3lgs1f829hi1r7r"; + name = "kactivities-stats-5.103.0.tar.xz"; }; }; kapidox = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kapidox-5.102.0.tar.xz"; - sha256 = "0jalyq3nzms4j55kqxmqbjyvbrdw0k1142mjpds24xjb87wgj1rq"; - name = "kapidox-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kapidox-5.103.0.tar.xz"; + sha256 = "0j1di36qxgl5p1ljp2jlgp60psgq2724q0ysfsxapl3p4h9swdy5"; + name = "kapidox-5.103.0.tar.xz"; }; }; karchive = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/karchive-5.102.0.tar.xz"; - sha256 = "0jnqrxpyfqwamq8gim270y5zg6l7inlplc50xdvig5dr0f4d1v20"; - name = "karchive-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/karchive-5.103.0.tar.xz"; + sha256 = "0lqkvp42dc7rd6s00dlfxv4zm81zqyr8ijn6nmiychyw3mlxyarp"; + name = "karchive-5.103.0.tar.xz"; }; }; kauth = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kauth-5.102.0.tar.xz"; - sha256 = "093c1rzgw3rh8ka1q5hdxnn56mxzrrn7v3r3yinr6cy0xif0c4ld"; - name = "kauth-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kauth-5.103.0.tar.xz"; + sha256 = "0m1x0b9ysl2rvm607q9qra6kwaalrgm8i8z4q7j8197a9njawffd"; + name = "kauth-5.103.0.tar.xz"; }; }; kbookmarks = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kbookmarks-5.102.0.tar.xz"; - sha256 = "1jg99z75bdkckahzia17ilbcfvnnamqg9ra0gx2lk1hlhzffi7ls"; - name = "kbookmarks-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kbookmarks-5.103.0.tar.xz"; + sha256 = "1b5dn6g54ix60dkvw6dmbxqjgimq6qy50qhrn2fj7r1rm6059pqs"; + name = "kbookmarks-5.103.0.tar.xz"; }; }; kcalendarcore = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcalendarcore-5.102.0.tar.xz"; - sha256 = "0s2m1d15py39nqagh1abprq6r099mdcci8sm28hp2c2cjwsr7xbk"; - name = "kcalendarcore-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcalendarcore-5.103.0.tar.xz"; + sha256 = "1pafc7iwin7lbh6n7b5qr1h7x3n6wdviqazcjl2z7ikysnqkphbp"; + name = "kcalendarcore-5.103.0.tar.xz"; }; }; kcmutils = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcmutils-5.102.0.tar.xz"; - sha256 = "1fiszfpay1cnyqhfyhl4mpw9j8jmknfisxgwqvd61qfa622ryhxj"; - name = "kcmutils-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcmutils-5.103.0.tar.xz"; + sha256 = "1xgrjv7r6zrlvjjqv07bqfb63f0vbhjj0sshi7qmf68k33g3c5fw"; + name = "kcmutils-5.103.0.tar.xz"; }; }; kcodecs = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcodecs-5.102.0.tar.xz"; - sha256 = "15k3rlbjb2dji8n7bxb4d8nc7cs7618fhv8x5k50x6kbx867rx88"; - name = "kcodecs-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcodecs-5.103.0.tar.xz"; + sha256 = "0fbgw84wf435ws0d9lldbgrmbscv6wz8pcws8dvfr7hkxkiwl52y"; + name = "kcodecs-5.103.0.tar.xz"; }; }; kcompletion = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcompletion-5.102.0.tar.xz"; - sha256 = "1jgr8an283l9d1zhl3cqpp66d90bscfv186jan01r8wan69awy2v"; - name = "kcompletion-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcompletion-5.103.0.tar.xz"; + sha256 = "0kvnrg3p7washajvll9qqsk81bw289s75vrqm5safgdvlb5p88yh"; + name = "kcompletion-5.103.0.tar.xz"; }; }; kconfig = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kconfig-5.102.0.tar.xz"; - sha256 = "0cxc2gfank22yzflxdjr766xn4lr2ij9b5v23g9y1mwfsc2ng3pn"; - name = "kconfig-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kconfig-5.103.0.tar.xz"; + sha256 = "065r7ggdh3yxnqas7x20kqhyv070d7xryvc8apj0xsz1cvsychaz"; + name = "kconfig-5.103.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kconfigwidgets-5.102.0.tar.xz"; - sha256 = "19vs2ydlw76v44xyzhfgl70dw0qan2g5z3dq0hzljf5pkc8mhr6p"; - name = "kconfigwidgets-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kconfigwidgets-5.103.0.tar.xz"; + sha256 = "0wx3dbqp3xhx3334qaxjv8hpixg25791lsnkbainhq2frhwfy77r"; + name = "kconfigwidgets-5.103.0.tar.xz"; }; }; kcontacts = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcontacts-5.102.0.tar.xz"; - sha256 = "04xi28mk5i0l1jgvw0dbapjnk2c6j1y1fxldhhapg722kiw9566y"; - name = "kcontacts-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcontacts-5.103.0.tar.xz"; + sha256 = "136ql3ycc1dw7njifxmqqsqkq2ig393206s0d0l6j7jlympng8sk"; + name = "kcontacts-5.103.0.tar.xz"; }; }; kcoreaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcoreaddons-5.102.0.tar.xz"; - sha256 = "0j09lb6lbyv5hvvw57i0s5pmd24cywzv9ncrd1chnbk0jcczkqw2"; - name = "kcoreaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcoreaddons-5.103.0.tar.xz"; + sha256 = "0sigfyznlnqba66i3qg22w1jl8lkhd1rjwd8da7gvgy2fh19vfdy"; + name = "kcoreaddons-5.103.0.tar.xz"; }; }; kcrash = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcrash-5.102.0.tar.xz"; - sha256 = "1i6jm2jgvqrm95dqdml0w0z9jc9j9n7h48y8zck7s3vaww1v7a67"; - name = "kcrash-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcrash-5.103.0.tar.xz"; + sha256 = "1rzbszkqirrgiiqjr468pw253c7a1d96bmhf0awhj9qnz5qs361m"; + name = "kcrash-5.103.0.tar.xz"; }; }; kdav = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdav-5.102.0.tar.xz"; - sha256 = "0prr27mv7mhcynvkp9kzk7a1xiawilvafvzv3a6xdkr5w91741bf"; - name = "kdav-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdav-5.103.0.tar.xz"; + sha256 = "0rm1nsbi6n6f6zvpja8cznz2lj4ca6jvzqjmvrd76pw2f2fii8il"; + name = "kdav-5.103.0.tar.xz"; }; }; kdbusaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdbusaddons-5.102.0.tar.xz"; - sha256 = "1lqskn739bix5fp1s40gb7fch66pa9bmlwxzfg9lyqa5xmpfxfzi"; - name = "kdbusaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdbusaddons-5.103.0.tar.xz"; + sha256 = "1qx4xcl6cakazpq7mpsnv2dl202y5agdypw0vvvw8j9bmc3bfxf6"; + name = "kdbusaddons-5.103.0.tar.xz"; }; }; kdeclarative = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdeclarative-5.102.0.tar.xz"; - sha256 = "0xvwr1mjviwixbs2i8yh3b37ds4jcgvfrv2z366dld40shs65m0a"; - name = "kdeclarative-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdeclarative-5.103.0.tar.xz"; + sha256 = "0lmjzxjm4hs4cb1m6704n6gqwpqvn8pib138mw8fvl8c03xmrjmn"; + name = "kdeclarative-5.103.0.tar.xz"; }; }; kded = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kded-5.102.0.tar.xz"; - sha256 = "0fjnb9wgpir91jwvl9dbnbvcf3c94l63vjs6ylvcd2w8lxasyxb7"; - name = "kded-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kded-5.103.0.tar.xz"; + sha256 = "13clr3d1rls3w4syr0bsiiqlvpv54lhvw9jwy0p7hpz1rsz619q0"; + name = "kded-5.103.0.tar.xz"; }; }; kdelibs4support = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kdelibs4support-5.102.0.tar.xz"; - sha256 = "0s823mcwg7l72aq55q8vh48pyp3apk3hm87jh9lc1ijg9frgcgk4"; - name = "kdelibs4support-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kdelibs4support-5.103.0.tar.xz"; + sha256 = "0lzq25a4q857j91496lxyhs4jf2l3p8s38xxnh0099f5la0akhpv"; + name = "kdelibs4support-5.103.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kdesignerplugin-5.102.0.tar.xz"; - sha256 = "1nn2f0jln4qni2gaq0anchrv42fcf83m22ag9r3c4sy7vxr8irbc"; - name = "kdesignerplugin-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kdesignerplugin-5.103.0.tar.xz"; + sha256 = "1jismdz12lnq6dkv3c44jicjjpl25hxm7ghl7yw4nh73c76xflhw"; + name = "kdesignerplugin-5.103.0.tar.xz"; }; }; kdesu = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdesu-5.102.0.tar.xz"; - sha256 = "0ps88rvvzagpw4qp4nj86wknyhm9mmdlkhs0i7cywf53pdr37afh"; - name = "kdesu-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdesu-5.103.0.tar.xz"; + sha256 = "19mbmnd1bl76dq8v0rm62lgkyl9b93a85g2zb1d9zkcqa5xcx2hi"; + name = "kdesu-5.103.0.tar.xz"; }; }; kdewebkit = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kdewebkit-5.102.0.tar.xz"; - sha256 = "137j897admfp5d8g1x1g5x9h4nmsp6padi17nx4y350kriyhxkkv"; - name = "kdewebkit-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kdewebkit-5.103.0.tar.xz"; + sha256 = "1kkmy641c4814aq8nfb56yq4ch724cwyv487wljpfly75migwcnz"; + name = "kdewebkit-5.103.0.tar.xz"; }; }; kdnssd = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdnssd-5.102.0.tar.xz"; - sha256 = "10awmh1j05hlg957ih7a1shapl6fgp1ma5b7qvbsp4fi5nh2k985"; - name = "kdnssd-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdnssd-5.103.0.tar.xz"; + sha256 = "1va56vqviic7y4b21g0kz6kdwf56bgylwv2wwrlbxcnz3dnsnyi6"; + name = "kdnssd-5.103.0.tar.xz"; }; }; kdoctools = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdoctools-5.102.0.tar.xz"; - sha256 = "11g671mlva00fk7yfym5a73sfjdy0zkhh3a7h4zv0s763nnmkg13"; - name = "kdoctools-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdoctools-5.103.0.tar.xz"; + sha256 = "1a74mkbfpxiyzs0p3q7hhndp1ricmc5mdbl96nd2c1i62pg84mxs"; + name = "kdoctools-5.103.0.tar.xz"; }; }; kemoticons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kemoticons-5.102.0.tar.xz"; - sha256 = "0arligy3i9qcqx9kapv692nz8dl1kimfv03392z3w3qqdwlpc9v5"; - name = "kemoticons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kemoticons-5.103.0.tar.xz"; + sha256 = "10psbw1myvvnj5d2ri5f4la4dqa3sj124qd7iyijw0k870hw5h8k"; + name = "kemoticons-5.103.0.tar.xz"; }; }; kfilemetadata = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kfilemetadata-5.102.0.tar.xz"; - sha256 = "0kv33rqp3wshhmv2pdayggxlxal6ihjam2als3d9a5hm1h5kz2fc"; - name = "kfilemetadata-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kfilemetadata-5.103.0.tar.xz"; + sha256 = "1h10jvdljlpasrkiidbdzfk8xs1gm5hm1j8m8nvz4mglhby9r329"; + name = "kfilemetadata-5.103.0.tar.xz"; }; }; kglobalaccel = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kglobalaccel-5.102.0.tar.xz"; - sha256 = "1l2mk7192wdb1qv62fqk9w1w6zbsmfr822gr5azg6nnzv4gdvadm"; - name = "kglobalaccel-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kglobalaccel-5.103.0.tar.xz"; + sha256 = "14jgs7nz4qw3d183s3rxkbz1mmbjamr57qdw7zi2xfpnma56ggls"; + name = "kglobalaccel-5.103.0.tar.xz"; }; }; kguiaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kguiaddons-5.102.0.tar.xz"; - sha256 = "1awgfnxmvghh70ldnpb1759wmy1i6rwsp3nggdj2ncdbdbgj04sv"; - name = "kguiaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kguiaddons-5.103.0.tar.xz"; + sha256 = "0cmjsp19q0c3cq433yq0id9habmrq0q8x3kvzi12pn64xzyq0cp6"; + name = "kguiaddons-5.103.0.tar.xz"; }; }; kholidays = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kholidays-5.102.0.tar.xz"; - sha256 = "01rznsqxg7crljzy0lcal6r03qvfg8qrh0zigh26073rdn56g5d1"; - name = "kholidays-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kholidays-5.103.0.tar.xz"; + sha256 = "1kahvipcxkcz3qql6rf3qlafpmqs51jj478icnb4hhfp8q2m9xda"; + name = "kholidays-5.103.0.tar.xz"; }; }; khtml = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/khtml-5.102.0.tar.xz"; - sha256 = "0az046m9n954cb70iqgx2isspbc0zb89fw97nhmw9szgfsliy8ab"; - name = "khtml-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/khtml-5.103.0.tar.xz"; + sha256 = "0d26ni10rdy6b368ij20j6bgf03hzdc7b7602fxnvwg0i0h54r4s"; + name = "khtml-5.103.0.tar.xz"; }; }; ki18n = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/ki18n-5.102.0.tar.xz"; - sha256 = "0iwz3jwaqlbja338gkq7sz7f8sw2rp37grkqpvx62274qflq1qww"; - name = "ki18n-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/ki18n-5.103.0.tar.xz"; + sha256 = "1rj0g12xjwm42qyrxb55mcpaz52s78b7i8ms9svrlza2gxi93siq"; + name = "ki18n-5.103.0.tar.xz"; }; }; kiconthemes = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kiconthemes-5.102.0.tar.xz"; - sha256 = "1q1fij7vn5b34k99cz4x58b5b8a04vrlkdckc8bxbbccpvy5xkyh"; - name = "kiconthemes-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kiconthemes-5.103.0.tar.xz"; + sha256 = "0khjzcy8b7rbf2pvpkin941a1cp1lsb2vr7n1ff3gdp33ra98828"; + name = "kiconthemes-5.103.0.tar.xz"; }; }; kidletime = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kidletime-5.102.0.tar.xz"; - sha256 = "159grvvw7zdp2hkiq20iz9zy8ilq6mfr3dmyq51pfq9741nd88qf"; - name = "kidletime-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kidletime-5.103.0.tar.xz"; + sha256 = "0hlq6jmkpdjmzcqzjdbhz3xw0b198cvd98zwyabirb8lf4v51wdh"; + name = "kidletime-5.103.0.tar.xz"; }; }; kimageformats = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kimageformats-5.102.0.tar.xz"; - sha256 = "1d29dnjca0fgwi5ri6x4gqgsp8h4x5yidf7ifnpf7qyhwm22r2x6"; - name = "kimageformats-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kimageformats-5.103.0.tar.xz"; + sha256 = "0zhyf9fh7i4jig8iryh2cp1m340ja2bzskayfisgx7fcm8bw8zfx"; + name = "kimageformats-5.103.0.tar.xz"; }; }; kinit = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kinit-5.102.0.tar.xz"; - sha256 = "03pzsnis8lpsglry5iwkwfvn6fnn82rdxn6pac1cs0jhxwhg9fdc"; - name = "kinit-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kinit-5.103.0.tar.xz"; + sha256 = "0y2xashdz2zv8gddaxr5w16l8yf1afi29b3a2rzh94ms9l0sln75"; + name = "kinit-5.103.0.tar.xz"; }; }; kio = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kio-5.102.0.tar.xz"; - sha256 = "0sviiq3axsxlf2nvxm0ccazbp7fw4dvky3dd87p82rng3v01g53a"; - name = "kio-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kio-5.103.0.tar.xz"; + sha256 = "0izljyzjzcbsf6hg4302b2vjjxvxkvs23nxs0x0cr2d4b8v3fj0b"; + name = "kio-5.103.0.tar.xz"; }; }; kirigami2 = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kirigami2-5.102.0.tar.xz"; - sha256 = "1ckmk0p0x5ymma3q5nkja3h6qz439qdxq0vchljg5yazxpiki08p"; - name = "kirigami2-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kirigami2-5.103.0.tar.xz"; + sha256 = "0i1pr1w1082i00zzxx5x9zhr3ijsyl3l9i5nzx4znxvp3qi7yrm6"; + name = "kirigami2-5.103.0.tar.xz"; }; }; kitemmodels = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kitemmodels-5.102.0.tar.xz"; - sha256 = "19iqg7lbln0h1fkssa2jj58c9j04lvwwbbzrq11ds1wzjvw77xsj"; - name = "kitemmodels-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kitemmodels-5.103.0.tar.xz"; + sha256 = "1jvhlcc0v3ww883rxb0nn4bh4pn91hmkdrr96vcwmwh8m1plsv1m"; + name = "kitemmodels-5.103.0.tar.xz"; }; }; kitemviews = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kitemviews-5.102.0.tar.xz"; - sha256 = "1c31qm059y7j0hskrbhm57qh6g2mm04qfjqbhili9qflp03fl69y"; - name = "kitemviews-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kitemviews-5.103.0.tar.xz"; + sha256 = "0klwci9dsa11f43q6nhcay506m800sk5gc03fkv0992y8mnh8sc0"; + name = "kitemviews-5.103.0.tar.xz"; }; }; kjobwidgets = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kjobwidgets-5.102.0.tar.xz"; - sha256 = "1r6xfi4hwfj9hn1hmgniyx17z3b1himh0fmc6bd45b89jzdvmqcl"; - name = "kjobwidgets-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kjobwidgets-5.103.0.tar.xz"; + sha256 = "11j8zx4lj04hw5g7jg7jyw6p34fd6qq9p813v2hlszfbjz3hldgs"; + name = "kjobwidgets-5.103.0.tar.xz"; }; }; kjs = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kjs-5.102.0.tar.xz"; - sha256 = "14w523kv5jfp4hzfbkawsf5pljahihj8jxkyjk5r707nrbnqzd3w"; - name = "kjs-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kjs-5.103.0.tar.xz"; + sha256 = "01wlv1lalmdspq2rgisv6csd4yxl0mxi476bcpr3i1zvvx9y2ijs"; + name = "kjs-5.103.0.tar.xz"; }; }; kjsembed = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kjsembed-5.102.0.tar.xz"; - sha256 = "179gr69n0v39lbxi95w1ckk20505h4zqhxsqmy6fjs9vxc3zja5s"; - name = "kjsembed-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kjsembed-5.103.0.tar.xz"; + sha256 = "0b44pxk01pk30rgqx2lxmwfq5x3nlj5yqcbc3qgfpj0hpfgkfl99"; + name = "kjsembed-5.103.0.tar.xz"; }; }; kmediaplayer = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kmediaplayer-5.102.0.tar.xz"; - sha256 = "0kmy4x9bi29nnd8sixrcdk4bhffh880a2p6pdcfz6sqp1i7n8v6s"; - name = "kmediaplayer-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kmediaplayer-5.103.0.tar.xz"; + sha256 = "1bwgy1l9qlx3cq2sjqva1g9d8j1di2mxs3cj9v6gjgn67cywm2sw"; + name = "kmediaplayer-5.103.0.tar.xz"; }; }; knewstuff = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/knewstuff-5.102.0.tar.xz"; - sha256 = "127w4vfpinq7lm6ckszfisyw7mjzs9v6s2ga4xyd6y7lzyf33gz5"; - name = "knewstuff-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/knewstuff-5.103.0.tar.xz"; + sha256 = "13mpx8frr9ypxx7p3567gi5w4g1ja40asp4cjs2qa9gs05y7kfj6"; + name = "knewstuff-5.103.0.tar.xz"; }; }; knotifications = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/knotifications-5.102.0.tar.xz"; - sha256 = "1y5sjzx9nyamalwl08y5krxajj0rvhhqgfdyavwkqbr30jpnmklk"; - name = "knotifications-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/knotifications-5.103.0.tar.xz"; + sha256 = "0dnrm3idaz8nnwr2va88xcf9pgxx5jrcxng5n7n8yh030dmcsg4g"; + name = "knotifications-5.103.0.tar.xz"; }; }; knotifyconfig = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/knotifyconfig-5.102.0.tar.xz"; - sha256 = "05s8nzc7a01w3rxjb9jg7d98v4rd2dnncpmmv7ap209z10i09qh8"; - name = "knotifyconfig-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/knotifyconfig-5.103.0.tar.xz"; + sha256 = "0z99s5ds619905dykw4ny8vsv2rkng6mw97kxma5padq2nspbfjs"; + name = "knotifyconfig-5.103.0.tar.xz"; }; }; kpackage = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kpackage-5.102.0.tar.xz"; - sha256 = "0mas3dq39lcij3nva0vmqrggm5b43grmmmszfjqd7hrmgpm93n43"; - name = "kpackage-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kpackage-5.103.0.tar.xz"; + sha256 = "15cvd5hc8dzmvas803canqxq5b0azdi2mb2qa7yj7881bjz08nvb"; + name = "kpackage-5.103.0.tar.xz"; }; }; kparts = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kparts-5.102.0.tar.xz"; - sha256 = "07vgc4fpwzkiylvlhniph7apggl563ma1hbnig9w1gkbwssyxjip"; - name = "kparts-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kparts-5.103.0.tar.xz"; + sha256 = "0wdmjg7vmqb3z8sq0g7krf3c5kwp1kfaklfrp5spc8nbh722y3az"; + name = "kparts-5.103.0.tar.xz"; }; }; kpeople = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kpeople-5.102.0.tar.xz"; - sha256 = "1wi08waz3jv1bz6yf8hbnkyx3k80hdgnwvq0s3hsr3hsaal46dv2"; - name = "kpeople-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kpeople-5.103.0.tar.xz"; + sha256 = "0b1qg0cklwdalgal4vamlis3mn3vxv54spl9fv3nm36pz3ddxm8m"; + name = "kpeople-5.103.0.tar.xz"; }; }; kplotting = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kplotting-5.102.0.tar.xz"; - sha256 = "1qq8m4wc9zz4s6l7myarryn2z7kj89rk51knjnq7kkibhbhwwsqy"; - name = "kplotting-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kplotting-5.103.0.tar.xz"; + sha256 = "14kb103jrzy8x5w0k62p2wi8pwdvivvi3chhrh71rsq3h4k56ddv"; + name = "kplotting-5.103.0.tar.xz"; }; }; kpty = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kpty-5.102.0.tar.xz"; - sha256 = "0f57fvljv7vmd89yyzbnj8lnafp495j3ial6dmh7wxfmbifw75gz"; - name = "kpty-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kpty-5.103.0.tar.xz"; + sha256 = "0jgah1sn4rfdrwldlp0xdzxwhnwdhk68lfcxyigyq5zig29zirls"; + name = "kpty-5.103.0.tar.xz"; }; }; kquickcharts = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kquickcharts-5.102.0.tar.xz"; - sha256 = "0w4h3jz5ki38y54papms2j1z57b0vna7ac89diffbld04aigjr40"; - name = "kquickcharts-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kquickcharts-5.103.0.tar.xz"; + sha256 = "198xnsdf6iaiqqvz38q1fh72yc8cjycfndwngvwnzy8cplgqxbd8"; + name = "kquickcharts-5.103.0.tar.xz"; }; }; kross = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kross-5.102.0.tar.xz"; - sha256 = "0hdbz4ki5ccjpsi8m1x31v9k6c4kl63ak4pfnqllaxjlmpz6yyw3"; - name = "kross-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kross-5.103.0.tar.xz"; + sha256 = "03gw42lfjr6fl159vnlsppax4pklkxccrxmfjajr8xa3vwm8fqyq"; + name = "kross-5.103.0.tar.xz"; }; }; krunner = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/krunner-5.102.0.tar.xz"; - sha256 = "0gvbmb8j7pqah1lvjcykr6i00q8zhybnc6b7x0ajndlqll72qzff"; - name = "krunner-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/krunner-5.103.0.tar.xz"; + sha256 = "0wna2p6flqg2xmky7j19ifwysrihnc738gzignygijlnz6jrxs05"; + name = "krunner-5.103.0.tar.xz"; }; }; kservice = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kservice-5.102.0.tar.xz"; - sha256 = "1plsv4bbmq7xq3y1cnqzvm85wjxp4ivlwnd4snis55ch2qpqcqvh"; - name = "kservice-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kservice-5.103.0.tar.xz"; + sha256 = "0f8axm47qk6x6l75mjvj879sfcndpyazx7wf16a6af1vklqkp86q"; + name = "kservice-5.103.0.tar.xz"; }; }; ktexteditor = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/ktexteditor-5.102.0.tar.xz"; - sha256 = "1kvki86rnkabrjbgkf7jbrj8lrn83nb4gw9j4h5jmyiam8ybkj2w"; - name = "ktexteditor-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/ktexteditor-5.103.0.tar.xz"; + sha256 = "03z5xsxrk48whm976ci8w44s23fxr98bx86m2in9amfymcfnab32"; + name = "ktexteditor-5.103.0.tar.xz"; }; }; ktextwidgets = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/ktextwidgets-5.102.0.tar.xz"; - sha256 = "1cipla0shfqpkx2gvvsxncsx4h9bc4zf078p1r9kf3v57pfdr0jc"; - name = "ktextwidgets-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/ktextwidgets-5.103.0.tar.xz"; + sha256 = "1rxmd7chc2ld767bdkm1qmigbasxcjbif90vksf6d00vmsm2kq4m"; + name = "ktextwidgets-5.103.0.tar.xz"; }; }; kunitconversion = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kunitconversion-5.102.0.tar.xz"; - sha256 = "11wdgzw5rsd0zbi24c6qvyavlx3hrnifq89ajyx1dpfsm1n21md3"; - name = "kunitconversion-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kunitconversion-5.103.0.tar.xz"; + sha256 = "0xxhzi4nq77941bcpx4833sk7p6fpigc21jzszy4400kzkjr3rzd"; + name = "kunitconversion-5.103.0.tar.xz"; }; }; kwallet = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwallet-5.102.0.tar.xz"; - sha256 = "10q9ckqybxdk14y7gy0fzaharz62axd965g17b0x18z9ln0g04d3"; - name = "kwallet-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwallet-5.103.0.tar.xz"; + sha256 = "0gzjzqpqpngk3syx802s8y8z0gmbzd09qmkrwrwfb0ssf9dyk5ra"; + name = "kwallet-5.103.0.tar.xz"; }; }; kwayland = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwayland-5.102.0.tar.xz"; - sha256 = "1k5109pjl4fdsiqw4dzg8pl8nw4y59gbgf8cn6w2wp1b42kz89l6"; - name = "kwayland-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwayland-5.103.0.tar.xz"; + sha256 = "1ad2697vymr0kw1zm9risy84izc402gma0ji1mhqcmrhfgn28807"; + name = "kwayland-5.103.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwidgetsaddons-5.102.0.tar.xz"; - sha256 = "1lnnn8y2d72qpiq76mr9vk4037a6g59x1cjyvrpxymb3k0i9gmji"; - name = "kwidgetsaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwidgetsaddons-5.103.0.tar.xz"; + sha256 = "0hb4ikk7i4b0nl2cmi2p8iw3n5v69i9lpd0452zzpl98idzcq22c"; + name = "kwidgetsaddons-5.103.0.tar.xz"; }; }; kwindowsystem = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwindowsystem-5.102.0.tar.xz"; - sha256 = "1qb8mb9mgqwdbrd2g4r7x7f2qfmdm54i77r2157n7by9j6j9n36r"; - name = "kwindowsystem-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwindowsystem-5.103.0.tar.xz"; + sha256 = "198kpz69zy7qzl4z69pxk06j2yf6z2zmg85i544i979rskpzhspc"; + name = "kwindowsystem-5.103.0.tar.xz"; }; }; kxmlgui = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kxmlgui-5.102.0.tar.xz"; - sha256 = "06hk6j8hsc05cy6d8i3a6xjxxzwrvshjb3ij6ji1yvcbmfs2rrrp"; - name = "kxmlgui-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kxmlgui-5.103.0.tar.xz"; + sha256 = "0134n806z7d2qy2wijg8mzwl6xv0dwjkz0yym58vafgh6l085pv0"; + name = "kxmlgui-5.103.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kxmlrpcclient-5.102.0.tar.xz"; - sha256 = "06bjxi3k9q3n261rsc0qil5zzf4lxqfizd9b0jny8ygvvjs9han4"; - name = "kxmlrpcclient-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kxmlrpcclient-5.103.0.tar.xz"; + sha256 = "14vnhm1kllcgpgrcjbf14hmzw4bi63k93fixkskfbb6gkh0ikxz7"; + name = "kxmlrpcclient-5.103.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/modemmanager-qt-5.102.0.tar.xz"; - sha256 = "195p7xmc8fzywna6j9ppaajqav27prjkl8slwggnsyjbh5bb3a76"; - name = "modemmanager-qt-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/modemmanager-qt-5.103.0.tar.xz"; + sha256 = "0p744iw9b8x4lkcmkncm7mfs2yvg9j95n3as6bmvqhfwyx4p3c88"; + name = "modemmanager-qt-5.103.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/networkmanager-qt-5.102.0.tar.xz"; - sha256 = "12q7fkhpidyyxa4byb88vsrkahgr4l2x3s9zylknb60cy86qpp69"; - name = "networkmanager-qt-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/networkmanager-qt-5.103.0.tar.xz"; + sha256 = "1ki1n0qm54fzdy8qc4mvb850h9jf1hpfx02zw8qwxx4a15by7jhx"; + name = "networkmanager-qt-5.103.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/oxygen-icons5-5.102.0.tar.xz"; - sha256 = "05mwijl3day3vm8gs085cg3g04xi1x8ypwd87nc80jw7pz1m7mf4"; - name = "oxygen-icons5-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/oxygen-icons5-5.103.0.tar.xz"; + sha256 = "134nhzackrqalb4dwlf9h75xx1zxmdfa08m91fp7msqis62bwzrq"; + name = "oxygen-icons5-5.103.0.tar.xz"; }; }; plasma-framework = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/plasma-framework-5.102.0.tar.xz"; - sha256 = "14al5i40bpjw73wk0by9ca88s26hbns7msa4kil6zinzh8pvbkfk"; - name = "plasma-framework-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/plasma-framework-5.103.0.tar.xz"; + sha256 = "1qca3r1sg0xximb5z6sdr6fxvyrfdcsjy3gv9ynj5fzqwk6cxcx0"; + name = "plasma-framework-5.103.0.tar.xz"; }; }; prison = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/prison-5.102.0.tar.xz"; - sha256 = "1iw14s4hf2ap8qfrj7kf5xicsz78b4lwydg58ymv6z70jcl329nn"; - name = "prison-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/prison-5.103.0.tar.xz"; + sha256 = "127jn03kc78p3r0y0h0ga0fm7csq3dmg59msnapfchf0z81gkia4"; + name = "prison-5.103.0.tar.xz"; }; }; purpose = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/purpose-5.102.0.tar.xz"; - sha256 = "1a50nx7ldgx3gaqfh0k8lc6fx2ww7k07glg2qah5crwlwqxv70iw"; - name = "purpose-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/purpose-5.103.0.tar.xz"; + sha256 = "0ah0vfpk96snpavjsazv2h2cym2i0pp0hnkfydl1840h6kybs27k"; + name = "purpose-5.103.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/qqc2-desktop-style-5.102.0.tar.xz"; - sha256 = "1c6mgfq4lznm69a5z6cycc17hlp5j96635rasksxgsnib7mvzwfq"; - name = "qqc2-desktop-style-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/qqc2-desktop-style-5.103.0.tar.xz"; + sha256 = "1998nwbkv9pqxkpdrmnl2a0ljg1490nfw23i7h9y5xg6m46bm3pi"; + name = "qqc2-desktop-style-5.103.0.tar.xz"; }; }; solid = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/solid-5.102.0.tar.xz"; - sha256 = "0cmik9c9s3nhqd5imkj4m9510whsf55nmw85xjsrnlh0fk6d7qq6"; - name = "solid-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/solid-5.103.0.tar.xz"; + sha256 = "0i6kwd2gsmikqnnl4wlhpbvws3z23s836yyzpz98vlf9rxxhhrz0"; + name = "solid-5.103.0.tar.xz"; }; }; sonnet = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/sonnet-5.102.0.tar.xz"; - sha256 = "04dci8l0v3v3s8fgn39sk67dbz44ah8qj5yvl5zn1xpwcfvj3ahf"; - name = "sonnet-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/sonnet-5.103.0.tar.xz"; + sha256 = "0kryq5icfqhyvavyxbbiv237gckk6cqay0iyh29snr20d0h2yf4k"; + name = "sonnet-5.103.0.tar.xz"; }; }; syndication = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/syndication-5.102.0.tar.xz"; - sha256 = "1w08fn43hr4mnff62kzay4rblxbg4p6fghcp5bnziaddl0jpr799"; - name = "syndication-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/syndication-5.103.0.tar.xz"; + sha256 = "107nfbh4kcwgnw46sfyb6vrr9gvpgi44rgh9s9vpmwrcvh388nng"; + name = "syndication-5.103.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/syntax-highlighting-5.102.0.tar.xz"; - sha256 = "03zjf58y9n6fq3zhybp86fqh65vxk2i4pqrrv4lwm6wz9pj289rg"; - name = "syntax-highlighting-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/syntax-highlighting-5.103.0.tar.xz"; + sha256 = "081nkc00ii78bj5hy88bd46w1ma4ckgg25w8xh3q6gqq4nnqy6a9"; + name = "syntax-highlighting-5.103.0.tar.xz"; }; }; threadweaver = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/threadweaver-5.102.0.tar.xz"; - sha256 = "1jxn1mf7xz3j9lz69kgcrqam87fxzyxp250vzl9hrs26jvw7lagr"; - name = "threadweaver-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/threadweaver-5.103.0.tar.xz"; + sha256 = "10pc8wx53yrizbh5nzqd5s7ly2qpiha5l1dbz5m8nxbli6hm7g19"; + name = "threadweaver-5.103.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 207017b5edd5..dfe2a6d7a965 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -79,7 +79,12 @@ let "-Dprotobuf_ABSL_PROVIDER=package" ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" - ]; + ] + # Tests fail to build on 32-bit platforms; fixed in 3.22 + # https://github.com/protocolbuffers/protobuf/issues/10418 + ++ lib.optional + (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") + "-Dprotobuf_BUILD_TESTS=OFF"; # unfortunately the shared libraries have yet to been patched by nix, thus tests will fail doCheck = false; diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 961e1a644baa..20dd72b662ce 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "python-restx"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-9CIAPsV0SJaBlNZZtWkqhhCJ/a1QEgbTkrCEBnuDVDo="; + sha256 = "sha256-Rp+TQjAZqgIS6jmj0PAqshD+5a3JPOr2Qw5l4INxK/Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index c7ddc590d97d..7f802a10b10f 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gdown"; - version = "4.6.0"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XOPbCu2lT0bKrLLfhvMcPj7NF8NVaJ5kVthftSi6l0k="; + hash = "sha256-/2pPAymq6dek2NsInD+ga+CYOTG7BPgWGNm7Iwp2GHg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix index 2d4fbf506408..65bbc142e325 100644 --- a/pkgs/development/python-modules/gridnet/default.nix +++ b/pkgs/development/python-modules/gridnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gridnet"; - version = "4.1.0"; + version = "4.2.0"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-gridnet"; rev = "refs/tags/v${version}"; - hash = "sha256-/UBZVbDRZMYHDrgifpYSTygAQTBiqgZ0tRGncE3GeT4="; + hash = "sha256-Enld68P9Cyq9Au4bsZQqPV26TL72pcmIm/Vg1DnheLk="; }; postPatch = '' diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 82571293abc6..f9bed90f8ba4 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.5.3"; + version = "3.6.0"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-D/i1KGKPuhayKU8jaXhWnVgpU5Z/SG12AW8R7bgSQh8="; + hash = "sha256-U8vHwdL1O54X0jPhcjTN/J1U7dKQgFEMfc6lbXe2Ff0="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix index 9775665869fd..cad1e0d47f08 100644 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ b/pkgs/development/tools/build-managers/bob/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "bob"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "benchkram"; repo = pname; rev = version; - hash = "sha256-OuIE3saJxk8IBLPbAxdQ2uJ9oXJ3xBOaeZraw9csy1U="; + hash = "sha256-yPdAf/j/vpQ2j+Zp8D7us7yaiDs47sKFPHZgggDjT3w="; }; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - vendorHash = "sha256-dmMoFyl9IX0QS6sNC6qzC4DQQQfvxmxuUeUfx0DBd/I="; + vendorHash = "sha256-6wAbwZKm8RTMt2Wm90N3AYZREipdo7Dq+XTWsLANd88="; excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 2f33b841525e..c7e82cd8c1f7 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3035"; + version = "0.20.3063"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-t9wMlKKeM3eP9ZJY7uXmWEQrpCXwmE7Tuxsx9ajh3p09ko265YiSQRSC7mPEBLSV7eVRBqh8rlVKCE2rm5Rglw=="; + hash = "sha512-ROp2nKfXD9OWsgEUz7lhqVusIBBMHUhaPOp3g4F/25bAN0vl5E0Mm4m3V9ChvFV6otlxfZJEByBlsC+aALxbyg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index e437de887c78..eaf631b4a8b2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.4.2"; + version = "1.5.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P0Fd10Q1p+KrExb35G6otHpc6pD61WnMll45H2jkevM="; + hash = "sha256-EBmydzzT0GB1TaGpnxwj1Cq1vvnDlZ+wqJ5Dc3KDT38="; }; installPhase = '' diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 10e10eff07c6..932e81a5177e 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -12,6 +12,8 @@ , withDocs ? false , texinfo , forFHSEnv ? false + +, pkgsStatic }: let @@ -116,6 +118,7 @@ stdenv.mkDerivation rec { passthru = { shellPath = "/bin/bash"; + tests.static = pkgsStatic.bash; }; meta = with lib; { diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index d0a1e0916367..bfe9f2274756 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,15 +4,21 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "1.6.3"; + version = "2.0.2"; src = fetchFromGitHub { - sha256 = "sha256-DOf+kpflDd2U1nXDLKYts/yf121CrBFIBI47OQa5XBs="; + sha256 = "sha256-xmOtL4v3UxdjrL09sSfXyF5FoMrNerSqG9nvEuwMvNM="; rev = version; repo = "s3backer"; owner = "archiecobbs"; }; + patches = [ + # from upstream, after latest release + # https://github.com/archiecobbs/s3backer/commit/303a669356fa7cd6bc95ac7076ce51b1cab3970a + ./fix-darwin-builds.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse curl expat ]; @@ -22,11 +28,6 @@ stdenv.mkDerivation rec { 'AC_CHECK_DECLS(fdatasync)' "" ''; - autoreconfPhase = '' - patchShebangs ./autogen.sh - ./autogen.sh - ''; - meta = with lib; { homepage = "https://github.com/archiecobbs/s3backer"; description = "FUSE-based single file backing store via Amazon S3"; diff --git a/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch b/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch new file mode 100644 index 000000000000..e5755f1cb9b0 --- /dev/null +++ b/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch @@ -0,0 +1,25 @@ +From 303a669356fa7cd6bc95ac7076ce51b1cab3970a Mon Sep 17 00:00:00 2001 +From: Adrian Ho <the.gromgit@gmail.com> +Date: Tue, 6 Sep 2022 10:49:10 +0800 +Subject: [PATCH] Enable macOS builds + +macOS requires explicit `environ` declaration. +--- + s3backer.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/s3backer.h b/s3backer.h +index ccc9053..383e246 100644 +--- a/s3backer.h ++++ b/s3backer.h +@@ -90,6 +90,10 @@ + #include <zlib.h> + #include <fuse.h> + ++#ifdef __APPLE__ ++extern char **environ; ++#endif ++ + #ifndef FUSE_OPT_KEY_DISCARD + #define FUSE_OPT_KEY_DISCARD -4 + #endif
\ No newline at end of file diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 2c78a0a62136..cefc80d3fe0c 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-kgjLjGloudigDTP6K4W8Tv42uK/dHyH1W2aI9+uh/ws="; + sha256 = "sha256-jHbxROO21cgbhEiWv9wQJyHWGGK14nGQuk9Fc9ufHqg="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 15c0d662ce2c..96f0e44716c5 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.24.3"; + version = "0.25.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-KREYWM5WOdPzLbOlrATiCCfFwE951KEo03yWNfyG8Bw="; + rev = "refs/tags/v${version}"; + hash = "sha256-+LplLeczLS+9EG0tZsiEs162/65zMCZfDDEq0iYQrGY="; }; - cargoSha256 = "sha256-Ul53/hDUFRb4xmILoMXXk2t465Vv+MQP4iLNn1twwnc="; + cargoHash = "sha256-FpoRO2g+R+Fo146kM0W8b1LHTEBHbGXURoX5jJk7lqY="; nativeBuildInputs = [ pkg-config @@ -37,8 +37,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Semi-automatic OSINT framework and package manager"; homepage = "https://github.com/kpcyrd/sn0int"; + changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ fab xrelkd ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de5cd64eeb43..343497d6761b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22703,13 +22703,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - # https://github.com/protocolbuffers/protobuf/issues/10418 - # protobuf versions have to match between build-time and run-time - # Using "targetPlatform" in the check makes sure that the version of - # pkgsCross.armv7l-hf-multiplatform.buildPackages.protobuf matches the - # version of pkgsCross.armv7l-hf-multiplatform.protobuf - protobuf = if stdenv.targetPlatform.is32bit then protobuf3_20 else - protobuf3_21; + protobuf = protobuf3_21; protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6fa30f0df814..f115511a1183 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -26521,10 +26521,10 @@ let URIdb = buildPerlModule { pname = "URI-db"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz"; - hash = "sha256-xJmd6vRRZSIWAyyOMn/25tZVU56sN5CVu2mww2nvplg="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.20.tar.gz"; + hash = "sha256-FMjaFawgljG445/BJFHJsTEa0LXKX5Aye9+peLfRPxQ="; }; propagatedBuildInputs = [ URINested ]; meta = { |
