diff options
Diffstat (limited to 'pkgs/development')
415 files changed, 8098 insertions, 8694 deletions
diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index 29ca54632478b..8b528aa77a952 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.8.2"; + version = "2201.8.3"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - hash = "sha256-vTrVcWo7fjcj9oZqIzvVTTynf4dSh5D7PAUYj3Vs8Gg="; + hash = "sha256-Vj+q0pm8uwsNt6n0o6Y/XpoWnb4HksJBgCujDFubS3w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/cone/default.nix b/pkgs/development/compilers/cone/default.nix index 9344160ad7628..d94432be12d38 100644 --- a/pkgs/development/compilers/cone/default.nix +++ b/pkgs/development/compilers/cone/default.nix @@ -6,13 +6,13 @@ llvmPackages.stdenv.mkDerivation rec { pname = "cone"; - version = "unstable-2021-07-25"; + version = "unstable-2022-12-12"; src = fetchFromGitHub { owner = "jondgoodwin"; repo = pname; - rev = "5feaabc342bcff3755f638a7e25155cd12127592"; - sha256 = "CTDS83AWtuDY5g6NDn7O2awrYsKFf3Kp35FkMEjfbVw="; + rev = "698bd6afc75777eabbc8ef576d64d683c6a1c5ab"; + sha256 = "0y2s9xgkci8n72v6gnc1i7shr2y3g2sa8fbr25gpxa9ipiq9khg7"; }; nativeBuildInputs = [ cmake ]; @@ -21,10 +21,10 @@ llvmPackages.stdenv.mkDerivation rec { llvmPackages.llvm ]; + # M68k is an experimental target, so not enabled by default postPatch = '' sed -i CMakeLists.txt \ - -e 's/LLVM 7/LLVM/' \ - -e '/AVR/d' + -e '/M68k/d' ''; installPhase = '' diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index 3b88ebc708b45..be1d98e87122f 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -108,7 +108,7 @@ let # archNames :: List String # E.g. [ "Turing" "Ampere" ] - archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap}) cudaCapabilities); + archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap} or (throw "missing cuda compute capability")) cudaCapabilities); # realArches :: List String # The real architectures are physical architectures supported by the CUDA version. diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index 0526825ee2114..c711e02d396ff 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.1.3"; in +let version = "3.2.0"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "00bjyjya5hb1aaywbbaqbsxas5q93xvxrz9sd3x40m3792zxdbfx"; + sha256 = "0a1mbi2si0ww9b96hx633xviwrbqk4skf7gxs0h95npw2cf6n9kd"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "0nansfrnzb8ximg15my8yv5kc2gih60rkann7r008h7zk5cd8nkr"; + sha256 = "0yhmhvfq8w6l8q5ahlxk5qbr3ji319snb8ghpi6y7px2pfbv5gwr"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "08njr5n7z94dfkmbi9wcdv5yciy94nzfgvjbdhsjswyq3h030a1b"; + sha256 = "052vz5zjjwjbww81qws3vyj39wkw2i9mqqs8fcifzgzbfdyc8lb0"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0ff73ws20i2j5lk2h2dy6k3fbfx7l9na9gqyji37c0dc67vxyl01"; + sha256 = "0wvpyjpvyaasazjmizb0ha3p70q3rhqpqq8bzl1bv9jrsgcniqsf"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "1703vsmw0m867gqzd2wy93bab0gg7z40r9rfin4lzhxw20x2brs4"; + sha256 = "1z187sl652fzkp3nf044snjh09svnvmlxh0ribzf3b955a40l8cd"; }; } diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index 9ce582623fe1b..544c1f6ed9207 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.41.0"; + version = "0.42.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-bDeqwk+grkCxmGE9H8Ks7Q8KvLxNCzaLe44DlR6E7YE="; + sha256 = "sha256-fkYyJxBlJWUkXGgcszerNKFNEFRIOm6tUyiTZj0q11k="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 01f1725130803..628b259acbd9c 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -259,7 +259,6 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ else [ "out" "lib" "man" "info" ]; setOutputFlags = false; - NIX_NO_SELF_RPATH = true; libc_dev = stdenv.cc.libc_dev; @@ -353,44 +352,59 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ # https://gcc.gnu.org/PR109898 enableParallelInstalling = false; - # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; - - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the - # library headers and binaries, regarless of the language being compiled. - # - # Note: When building the Java AWT GTK peer, the build system doesn't honor - # `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add - # them to $CPATH and $LIBRARY_PATH in this case. - # - # Likewise, the LTO code doesn't find zlib. - # - # Cross-compiling, we need gcc not to read ./specs in order to build the g++ - # compiler (after the specs for the cross-gcc are created). Having - # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - - CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] - ++ optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - )); - - LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ( - optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - )); - - inherit (callFile ./common/extra-target-flags.nix { }) - EXTRA_FLAGS_FOR_TARGET - EXTRA_LDFLAGS_FOR_TARGET - ; + env = mapAttrs (_: v: toString v) ({ + + NIX_NO_SELF_RPATH = true; + + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Note: When building the Java AWT GTK peer, the build system doesn't honor + # `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add + # them to $CPATH and $LIBRARY_PATH in this case. + # + # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. + + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + )); + + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ( + optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + )); + + inherit (callFile ./common/extra-target-flags.nix { }) + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET + ; + } // optionalAttrs is7 { + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument" + # Downgrade register storage class specifier errors to warnings when building a cross compiler from a clang stdenv. + + lib.optionalString (stdenv.cc.isClang && targetPlatform != hostPlatform) " -Wno-register"; + } // optionalAttrs (!is7 && !atLeast12 && stdenv.cc.isClang && targetPlatform != hostPlatform) { + NIX_CFLAGS_COMPILE = "-Wno-register"; + } // optionalAttrs (!atLeast7) { + inherit langJava; + } // optionalAttrs atLeast6 { + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; + }); passthru = { - inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; + inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD langJava version; isGNU = true; } // lib.optionalAttrs (!atLeast12) { hardeningUnsupportedFlags = lib.optionals is48 [ "stackprotector" ] ++ [ "fortify3" ]; @@ -410,18 +424,14 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ ; } // lib.optionalAttrs (!atLeast11) { badPlatforms = if !(is48 || is49) then [ "aarch64-darwin" ] else lib.platforms.darwin; + } // lib.optionalAttrs is11 { + badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; }; -} // optionalAttrs is7 { - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; -} // lib.optionalAttrs (!atLeast10 && stdenv.hostPlatform.isDarwin) { +} // lib.optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) { # GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools. preBuild = '' makeFlagsArray+=('STRIP=${lib.getBin darwin.cctools-port}/bin/${stdenv.cc.targetPrefix}strip') ''; -} // optionalAttrs (!atLeast7) { - env.langJava = langJava; -} // optionalAttrs atLeast6 { - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; } // optionalAttrs (!atLeast8) { doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv } // optionalAttrs enableMultilib { diff --git a/pkgs/development/compilers/gcc/patches/11/avr-gcc-11.3-darwin.patch b/pkgs/development/compilers/gcc/patches/11/avr-gcc-11.3-darwin.patch deleted file mode 100644 index 787862fbcffaa..0000000000000 --- a/pkgs/development/compilers/gcc/patches/11/avr-gcc-11.3-darwin.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/gcc/config/avr/avr.c 2022-10-08 19:18:33.000000000 +0200 -+++ b/gcc/config/avr/avr.patched.c 2022-10-08 19:19:34.000000000 +0200 -@@ -10196,7 +10196,7 @@ - to track need of __do_copy_data. */ - - static void --avr_output_data_section_asm_op (const void *data) -+avr_output_data_section_asm_op (const char *data) - { - avr_need_copy_data_p = true; - -@@ -10209,7 +10209,7 @@ - to track need of __do_clear_bss. */ - - static void --avr_output_bss_section_asm_op (const void *data) -+avr_output_bss_section_asm_op (const char *data) - { - avr_need_clear_bss_p = true; - diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 9eda241f6d3ac..32938be376d9b 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -175,9 +175,6 @@ in ## gcc 11.0 and older ############################################################################## -# https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 -++ optional (is11 && stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch - # libgcc’s `configure` script misdetects aarch64-darwin, resulting in an invalid deployment target. ++ optional (is11 && stdenv.isDarwin && stdenv.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index d7d2578cdc494..58e61604cd61a 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -10,7 +10,9 @@ assert stdenv.targetPlatform == stdenv.hostPlatform; let - useLLVM = !stdenv.targetPlatform.isx86; + useLLVM = !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc); useNcurses6 = stdenv.hostPlatform.system == "x86_64-linux" || (with stdenv.hostPlatform; isPower64 && isLittleEndian); @@ -38,7 +40,7 @@ let targetPackages.stdenv.cc.bintools coreutils # for cat ] - ++ lib.optionals useLLVM [ + ++ lib.optionals (assert useLLVM -> !(llvmPackages == null); useLLVM) [ (lib.getBin llvmPackages.llvm) ] # On darwin, we need unwrapped bintools as well (for otool) @@ -66,10 +68,6 @@ stdenv.mkDerivation rec { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; sha256 = "18dlqm5d028fqh6ghzn7pgjspr5smw030jjzl3kq6q1kmwzbay6g"; }; - aarch64-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; - sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq"; - }; x86_64-darwin = { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz"; @@ -216,7 +214,12 @@ stdenv.mkDerivation rec { meta = rec { license = lib.licenses.bsd3; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "powerpc64le-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + "x86_64-darwin" + "powerpc64le-linux" + ]; # build segfaults, use ghc8102Binary which has proper musl support instead broken = stdenv.hostPlatform.isMusl; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix deleted file mode 100644 index b00b6183121d9..0000000000000 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ /dev/null @@ -1,381 +0,0 @@ -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || stdenv.targetPlatform.isSparc) -, # LLVM is conceptually a run-time-only dependency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildTargetLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp - && lib.meta.availableOn stdenv.targetPlatform gmp) -, gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, enableProfiledLibs ? true - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to build sphinx documentation. - enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pullls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl - ) - -, enableHaddockProgram ? - # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isiOS -}: - -assert !enableIntegerSimple -> gmp != null; - -# Cross cannot currently build the `haddock` program for silly reasons, -# see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = dontStrip: '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} - BUILD_SPHINX_PDF = NO - '' + - # Note [HADDOCK_DOCS]: - # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` - # program is built (which we generally always want to have a complete GHC install) - # and whether it is run on the GHC sources to generate hyperlinked source code - # (which is impossible for cross-compilation); see: - # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 - # This implies that currently a cross-compiled GHC will never have a `haddock` - # program, so it can never generate haddocks for any packages. - # If this is solved in the future, we'd like to unconditionally - # build the haddock program (removing the `enableHaddockProgram` option). - '' - HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' - # We only need to build stage1 on most cross-compilation because - # we will be running the compiler on the native system. In some - # situations, like native Musl compilation, we need the compiler - # to actually link to our new Libc. The iOS simulator is a special - # exception because we can’t actually run simulators binaries - # ourselves. - + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - '' + lib.optionalString dontStrip '' - STRIP_CMD = : - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - '' - # While split sections are now enabled by default in ghc 8.8 for windows, - # they seem to lead to `too many sections` errors when building base for - # profiling. - + lib.optionalString targetPlatform.isWindows '' - SplitSections = NO - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - # TODO(@sternenseemann): is buildTarget LLVM unnecessary? - # GHC doesn't seem to have {LLC,OPT}_HOST - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. - # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); - - # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. - variantSuffix = lib.concatStrings [ - (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableIntegerSimple "-integer-simple") - ]; - -in - -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; - -stdenv.mkDerivation (rec { - version = "8.8.4"; - pname = "${targetPrefix}ghc${variantSuffix}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0bgwbxxvdn56l91bp9p5d083gzcfdi6z8l8b17qzjpr3n8w5wl7h"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # Fix docs build with sphinx >= 6.0 - # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 - ./ghc-8.8.4-sphinx-6.0.patch - - # See upstream patch at - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build - # from source distributions, the auto-generated configure script needs to be - # patched as well, therefore we use an in-tree patch instead of pulling the - # upstream patch. Don't forget to check backport status of the upstream patch - # when adding new GHC releases in nixpkgs. - ./respect-ar-path.patch - # Fix documentation configuration which causes a syntax error with sphinx 4.* - # See also https://gitlab.haskell.org/ghc/ghc/-/issues/19962 - ./sphinx-4-configuration.patch - # cabal passes incorrect --host= when cross-compiling - # https://github.com/haskell/cabal/issues/5887 - (fetchpatch { - url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch"; - sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1"; - }) - - # error: 'VirtualAllocExNuma' redeclared as different kind of symbol - # name conflict between rts/win32/OSMem.c and winbase.h from the mingw-w64 runtime package - # Renamed to match ghc8.8: - # https://gitlab.haskell.org/ghc/ghc/-/commit/4b431f334018eaef2cf36de3316025c68c922915#20d64c0bdc272817149d1d5cf20a73a8b5fd637f - ./rename-numa-api-call.patch - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths - preConfigure = - # Aarch64 allow backward bootstrapping since earlier versions are unstable. - # Same for musl, as earlier versions do not provide a musl bindist for bootstrapping. - lib.optionalString (stdenv.isAarch64 || stdenv.hostPlatform.isMusl) '' - find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \ - -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \; - '' - + '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" - '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' - # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" - '' + '' - - echo -n "${buildMK dontStrip}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals enableDocs [ - sphinx - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = - [ "format" ] - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # This is used by the haskell builder to query - # the presence of the haddock program. - hasHaddock = enableHaddockProgram; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ - guibou - ] ++ lib.teams.haskell.members; - timeout = 24 * 3600; - inherit (ghc.meta) license; - # hardcode platforms because the bootstrap GHC differs depending on the platform, - # with differing platforms available for each of them; See HACK comment in - # 8.10.2-binary.nix for an explanation of the musl special casing. - platforms = [ - "x86_64-linux" - ] ++ lib.optionals (!hostPlatform.isMusl) [ - "i686-linux" - "aarch64-linux" - "x86_64-darwin" - ]; - # integer-simple builds are broken with musl when bootstrapping using - # GHC 8.10.2 and below, however it is not possible to reverse bootstrap - # GHC 8.8.4 with GHC 8.10.7. - # See https://github.com/NixOS/nixpkgs/pull/138523#issuecomment-927339953 - broken = hostPlatform.isMusl && enableIntegerSimple; - }; - - dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 83b986be2b328..8bc9a58351773 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -477,6 +477,14 @@ stdenv.mkDerivation ({ preInstall = '' pushd _build/bindist/* + '' + # the bindist configure script uses different env variables than the GHC configure script + # see https://github.com/NixOS/nixpkgs/issues/267250 and https://gitlab.haskell.org/ghc/ghc/-/issues/24211 + + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export InstallNameToolCmd=$INSTALL_NAME_TOOL + export OtoolCmd=$OTOOL + '' + + '' $configureScript $configureFlags "''${configureFlagsArray[@]}" ''; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 6b8d657f34ec7..a6fff5feb6b01 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.9.20231014"; - rev = "13d3c613c3c1e4942c698449bdf58a6a13b76695"; - sha256 = "13xp4ijnym2qbw2qbxkvfb79l7034vrcm9j2j9kirbhjxzdshvx9"; + version = "9.9.20231121"; + rev = "955520c6c4f07187b6d5e4770ecf681cc78374f2"; + sha256 = "0pv77khciv513aw64pfac5p60xn5z90rxl84dcalj6knmbhm8dqy"; } diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index b2a5561dcf4dc..db03d2d85ca25 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -30,16 +30,16 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.14828.8"; + version = "1.0.15136.4"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - hash = "sha256-BGmZVBEw7XlgbQcWgRK+qbJS9U4Sm9G8g9m0GRUhmCI="; + hash = "sha256-Qh3FNck1z+rr7eSqxVnNs7YKvgXpKGY5dd3yx1Ft9Mg="; }; - nativeBuildInputs = [ bison cmake flex python3 ]; + nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ]; buildInputs = [ lld llvm spirv-headers spirv-llvm-translator' spirv-tools ]; diff --git a/pkgs/development/compilers/llvm/6/lldb/default.nix b/pkgs/development/compilers/llvm/6/lldb/default.nix index e64584edf29d1..c8d3c4c1a771d 100644 --- a/pkgs/development/compilers/llvm/6/lldb/default.nix +++ b/pkgs/development/compilers/llvm/6/lldb/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.DebugSymbols darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; CXXFLAGS = "-fno-rtti"; diff --git a/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch b/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch deleted file mode 100644 index 764dddd966cbb..0000000000000 --- a/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8412cba68835f8f4cc527d02194b181faa5944d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de> -Date: Tue, 21 Jan 2020 19:46:09 +0100 -Subject: [PATCH] [HIP] use GetProgramPath for executable discovery - -This change replaces the manual building of executable paths -using llvm::sys::path::append with GetProgramPath. -This enables adding other paths in case executables reside -in different directories and makes the code easier to read. - -Differential Revision: https://reviews.llvm.org/D72903 ---- - clang/lib/Driver/ToolChains/HIP.cpp | 18 ++++++------------ - 1 file changed, 6 insertions(+), 12 deletions(-) - -diff --git a/lib/Driver/ToolChains/HIP.cpp b/lib/Driver/ToolChains/HIP.cpp -index 03acf45a9b3..75fd3226c75 100644 ---- a/lib/Driver/ToolChains/HIP.cpp -+++ b/lib/Driver/ToolChains/HIP.cpp -@@ -98,9 +98,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand( - const char *OutputFileName = - C.addTempFile(C.getArgs().MakeArgString(TmpName)); - CmdArgs.push_back(OutputFileName); -- SmallString<128> ExecPath(C.getDriver().Dir); -- llvm::sys::path::append(ExecPath, "llvm-link"); -- const char *Exec = Args.MakeArgString(ExecPath); -+ const char *Exec = -+ Args.MakeArgString(getToolChain().GetProgramPath("llvm-link")); - C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs)); - return OutputFileName; - } -@@ -141,9 +140,8 @@ const char *AMDGCN::Linker::constructOptCommand( - const char *OutputFileName = - C.addTempFile(C.getArgs().MakeArgString(TmpFileName)); - OptArgs.push_back(OutputFileName); -- SmallString<128> OptPath(C.getDriver().Dir); -- llvm::sys::path::append(OptPath, "opt"); -- const char *OptExec = Args.MakeArgString(OptPath); -+ const char *OptExec = -+ Args.MakeArgString(getToolChain().GetProgramPath("opt")); - C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs)); - return OutputFileName; - } -@@ -161,9 +159,7 @@ const char *AMDGCN::Linker::constructLlcCommand( - const char *LlcOutputFile = - C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName)); - LlcArgs.push_back(LlcOutputFile); -- SmallString<128> LlcPath(C.getDriver().Dir); -- llvm::sys::path::append(LlcPath, "llc"); -- const char *Llc = Args.MakeArgString(LlcPath); -+ const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc")); - C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs)); - return LlcOutputFile; - } -@@ -178,9 +174,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA, - ArgStringList LldArgs{"-flavor", "gnu", "--no-undefined", - "-shared", "-o", Output.getFilename(), - InputFileName}; -- SmallString<128> LldPath(C.getDriver().Dir); -- llvm::sys::path::append(LldPath, "lld"); -- const char *Lld = Args.MakeArgString(LldPath); -+ const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld")); - C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs)); - } - --- -2.23.1 - diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix deleted file mode 100644 index 136a69e72161a..0000000000000 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 -, buildLlvmTools -, fixDarwinDylibNames -, enableManpages ? false -, enablePolly ? false # TODO: get this info from llvm (passthru?) -}: - -let - self = stdenv.mkDerivation ({ - pname = "clang"; - inherit version; - - src = fetch "cfe" "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}* clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - nativeBuildInputs = [ cmake python3 ] - ++ lib.optional enableManpages python3.pkgs.sphinx - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ libxml2 libllvm ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLVM_ENABLE_RTTI=ON" - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals enableManpages [ - "-DCLANG_INCLUDE_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" - ] ++ lib.optionals enablePolly [ - "-DWITH_POLLY=ON" - "-DLINK_POLLY_INTO_TOOLS=ON" - ]; - - patches = [ - ../../common/clang/5-8-purity.patch - # make clang -xhip use $PATH to find executables - ./HIP-use-PATH-7.patch - # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is - # needed for our bootstrapping to not interfere with C. - ./unwindlib.patch - ./gnu-install-dirs.patch - (substituteAll { - src = ../../clang-6-10-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; - }) - ]; - - postPatch = '' - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace tools/extra/clangd/CMakeLists.txt \ - --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - postInstall = '' - ln -sv $out/bin/clang $out/bin/cpp - - # Move libclang to 'lib' output - moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - - mkdir -p $python/bin $python/share/{clang,scan-view} - mv $out/bin/{git-clang-format,scan-view} $python/bin - if [ -e $out/bin/set-xcode-analyzer ]; then - mv $out/bin/set-xcode-analyzer $python/bin - fi - mv $out/share/clang/*.py $python/share/clang - mv $out/share/scan-view/*.py $python/share/scan-view - rm $out/bin/c-index-test - patchShebangs $python/bin - - mkdir -p $dev/bin - cp bin/clang-tblgen $dev/bin - ''; - - passthru = { - inherit libllvm; - isClang = true; - hardeningUnsupportedFlags = [ "fortify3" ]; - }; - - meta = llvm_meta // { - homepage = "https://clang.llvm.org/"; - description = "A C language family frontend for LLVM"; - longDescription = '' - The Clang project provides a language front-end and tooling - infrastructure for languages in the C language family (C, C++, Objective - C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. - It aims to deliver amazingly fast compiles, extremely useful error and - warning messages and to provide a platform for building great source - level tools. The Clang Static Analyzer and clang-tidy are tools that - automatically find bugs in your code, and are great examples of the sort - of tools that can be built using the Clang frontend as a library to - parse C/C++ code. - ''; - mainProgram = "clang"; - }; - } // lib.optionalAttrs enableManpages { - pname = "clang-manpages"; - - buildPhase = '' - make docs-clang-man - ''; - - installPhase = '' - mkdir -p $out/share/man/man1 - # Manually install clang manpage - cp docs/man/*.1 $out/share/man/man1/ - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man page for Clang ${version}"; - }; - }); -in self diff --git a/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch deleted file mode 100644 index 540c043a2db9a..0000000000000 --- a/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch +++ /dev/null @@ -1,281 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52b881939499..85662a2113e7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) - project(Clang) - -+ include(GNUInstallDirs) -+ - # Rely on llvm-config. - set(CONFIG_OUTPUT) - find_program(LLVM_CONFIG "llvm-config") -@@ -374,7 +376,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/clang include/clang-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.def" - PATTERN "*.h" -@@ -383,7 +385,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "CMakeFiles" EXCLUDE - PATTERN "*.inc" -@@ -391,7 +393,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(PROGRAMS utils/bash-autocomplete.sh -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - ) - endif() - -diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index c09a8423f9f6..39f37e0097eb 100644 ---- a/cmake/modules/AddClang.cmake -+++ b/cmake/modules/AddClang.cmake -@@ -99,9 +99,9 @@ macro(add_clang_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_clangtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -141,7 +141,7 @@ macro(add_clang_tool name) - - install(TARGETS ${name} - ${export_to_clangtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -156,5 +156,5 @@ endmacro() - macro(add_clang_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index 1930d8e225c7..bb9158093079 100644 ---- a/lib/Headers/CMakeLists.txt -+++ b/lib/Headers/CMakeLists.txt -@@ -162,19 +162,19 @@ install( - FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) - - install( - FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_fp16.h - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) - - install( - FILES ${cuda_wrapper_files} - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) - - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. - add_llvm_install_targets(install-clang-headers -diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt -index 53e3421f1b35..79ae5bb4c399 100644 ---- a/tools/c-index-test/CMakeLists.txt -+++ b/tools/c-index-test/CMakeLists.txt -@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH - "@executable_path/../../lib") - else() -- set(INSTALL_DESTINATION bin) -+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - - install(TARGETS c-index-test -diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt -index c5ace26c2914..97bdfca7d896 100644 ---- a/tools/clang-check/CMakeLists.txt -+++ b/tools/clang-check/CMakeLists.txt -@@ -20,4 +20,4 @@ target_link_libraries(clang-check - ) - - install(TARGETS clang-check -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt -index a295e8cd0b2a..1973ff82c7f6 100644 ---- a/tools/clang-format/CMakeLists.txt -+++ b/tools/clang-format/CMakeLists.txt -@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) - endif() - - install(PROGRAMS clang-format-bbedit.applescript -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-diff.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-sublime.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS git-clang-format -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT clang-format) -diff --git a/tools/clang-func-mapping/CMakeLists.txt b/tools/clang-func-mapping/CMakeLists.txt -index ae28e28d532d..8ecb2e37a8f7 100644 ---- a/tools/clang-func-mapping/CMakeLists.txt -+++ b/tools/clang-func-mapping/CMakeLists.txt -@@ -20,4 +20,4 @@ target_link_libraries(clang-func-mapping - ) - - install(TARGETS clang-func-mapping -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt -index 8718015be76a..7a038f39622e 100644 ---- a/tools/clang-offload-bundler/CMakeLists.txt -+++ b/tools/clang-offload-bundler/CMakeLists.txt -@@ -22,4 +22,4 @@ target_link_libraries(clang-offload-bundler - ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} - ) - --install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) -+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt -index 3b3ab1540a80..9aca9ba4a2cf 100644 ---- a/tools/clang-rename/CMakeLists.txt -+++ b/tools/clang-rename/CMakeLists.txt -@@ -18,8 +18,8 @@ target_link_libraries(clang-rename - ) - - install(PROGRAMS clang-rename.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) - install(PROGRAMS clang-rename.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) -diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt -index 96d1c390249c..41c762b37b76 100644 ---- a/tools/diagtool/CMakeLists.txt -+++ b/tools/diagtool/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(diagtool - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(TARGETS diagtool - COMPONENT diagtool -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-diagtool -diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index e539c8308e75..4e1fbccea35d 100644 ---- a/tools/libclang/CMakeLists.txt -+++ b/tools/libclang/CMakeLists.txt -@@ -130,7 +130,7 @@ endif() - if(INTERNAL_INSTALL_PREFIX) - set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") - else() -- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) -+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - endif() - - install(DIRECTORY ../../include/clang-c -diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt -index 380379300b09..adfd58ed5f7d 100644 ---- a/tools/scan-build/CMakeLists.txt -+++ b/tools/scan-build/CMakeLists.txt -@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(LibexecFile ${LibexecFiles}) -@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/libexec/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) -- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) -+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) - endforeach() - - foreach(ManPage ${ManPages}) -@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/share/scan-build/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) -- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) -+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) - endforeach() - - add_custom_target(scan-build ALL DEPENDS ${Depends}) -diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt -index b305ca562a72..554bcb379061 100644 ---- a/tools/scan-view/CMakeLists.txt -+++ b/tools/scan-view/CMakeLists.txt -@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(ShareFile ${ShareFiles}) -@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/share/scan-view/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) -- install(FILES share/${ShareFile} DESTINATION share/scan-view) -+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) - endforeach() - - add_custom_target(scan-view ALL DEPENDS ${Depends}) -diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt -index 5573009d343a..24b3a90f233f 100644 ---- a/utils/hmaptool/CMakeLists.txt -+++ b/utils/hmaptool/CMakeLists.txt -@@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) - - list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) --install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION bin) -+install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION ${CMAKE_INSTALL_BINDIR}) - - add_custom_target(hmaptool ALL DEPENDS ${Depends}) - set_target_properties(hmaptool PROPERTIES FOLDER "Utils") diff --git a/pkgs/development/compilers/llvm/7/clang/unwindlib.patch b/pkgs/development/compilers/llvm/7/clang/unwindlib.patch deleted file mode 100644 index 59a092d7c7069..0000000000000 --- a/pkgs/development/compilers/llvm/7/clang/unwindlib.patch +++ /dev/null @@ -1,227 +0,0 @@ -commit a5cacb5ba7f1f18e7bb6f6709e42683eeb7e6470 -Author: Sterling Augustine <saugustine@google.com> -Date: Tue Mar 19 20:01:59 2019 +0000 - - Add --unwindlib=[libgcc|compiler-rt] to parallel --rtlib= [take 2] - - "clang++ hello.cc --rtlib=compiler-rt" - - now can works without specifying additional unwind or exception - handling libraries. - - This reworked version of the feature no longer modifies today's default - unwind library for compiler-rt: which is nothing. Rather, a user - can specify -DCLANG_DEFAULT_UNWINDLIB=libunwind when configuring - the compiler. - - This should address the issues from the previous version. - - Update tests for new --unwindlib semantics. - - Differential Revision: https://reviews.llvm.org/D59109 - - llvm-svn: 356508 - -diff --git clang/CMakeLists.txt clang/CMakeLists.txt -index 52b881939499..2c3fb62f6e73 100644 ---- clang/CMakeLists.txt -+++ clang/CMakeLists.txt -@@ -244,6 +244,24 @@ if (NOT(CLANG_DEFAULT_RTLIB STREQUAL "" OR - "Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)" FORCE) - endif() - -+set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING -+ "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty to match runtime library.)") -+if (CLANG_DEFAULT_UNWINDLIB STREQUAL "") -+ if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc") -+ set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE) -+ elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind") -+ set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE) -+ endif() -+endif() -+ -+if (NOT(CLANG_DEFAULT_UNWINDLIB STREQUAL "none" OR -+ CLANG_DEFAULT_UNWINDLIB STREQUAL "libgcc" OR -+ CLANG_DEFAULT_UNWINDLIB STREQUAL "libunwind")) -+ message(WARNING "Resetting default unwindlib to use platform default") -+ set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING -+ "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty for none)" FORCE) -+endif() -+ - set(CLANG_DEFAULT_OBJCOPY "objcopy" CACHE STRING - "Default objcopy executable to use.") - -diff --git clang/include/clang/Basic/DiagnosticDriverKinds.td clang/include/clang/Basic/DiagnosticDriverKinds.td -index 7f75f45c6578..7e1bb33b5cef 100644 ---- clang/include/clang/Basic/DiagnosticDriverKinds.td -+++ clang/include/clang/Basic/DiagnosticDriverKinds.td -@@ -52,6 +52,10 @@ def err_drv_invalid_rtlib_name : Error< - "invalid runtime library name in argument '%0'">; - def err_drv_unsupported_rtlib_for_platform : Error< - "unsupported runtime library '%0' for platform '%1'">; -+def err_drv_invalid_unwindlib_name : Error< -+ "invalid unwind library name in argument '%0'">; -+def err_drv_incompatible_unwindlib : Error< -+ "--rtlib=libgcc requires --unwindlib=libgcc">; - def err_drv_invalid_stdlib_name : Error< - "invalid library name in argument '%0'">; - def err_drv_invalid_output_with_multiple_archs : Error< -diff --git clang/include/clang/Config/config.h.cmake clang/include/clang/Config/config.h.cmake -index 1d624450b9d9..2d4cb747e87e 100644 ---- clang/include/clang/Config/config.h.cmake -+++ clang/include/clang/Config/config.h.cmake -@@ -23,6 +23,9 @@ - /* Default runtime library to use. */ - #define CLANG_DEFAULT_RTLIB "${CLANG_DEFAULT_RTLIB}" - -+/* Default unwind library to use. */ -+#define CLANG_DEFAULT_UNWINDLIB "${CLANG_DEFAULT_UNWINDLIB}" -+ - /* Default objcopy to use */ - #define CLANG_DEFAULT_OBJCOPY "${CLANG_DEFAULT_OBJCOPY}" - -diff --git clang/include/clang/Driver/Options.td clang/include/clang/Driver/Options.td -index 601aa8744967..0e74a2d36dea 100644 ---- clang/include/clang/Driver/Options.td -+++ clang/include/clang/Driver/Options.td -@@ -2428,6 +2428,8 @@ def std_EQ : Joined<["-", "--"], "std=">, Flags<[CC1Option]>, - }]>; - def stdlib_EQ : Joined<["-", "--"], "stdlib=">, Flags<[CC1Option]>, - HelpText<"C++ standard library to use">, Values<"libc++,libstdc++,platform">; -+def unwindlib_EQ : Joined<["-", "--"], "unwindlib=">, Flags<[CC1Option]>, -+ HelpText<"Unwind library to use">, Values<"libgcc,unwindlib,platform">; - def sub__library : JoinedOrSeparate<["-"], "sub_library">; - def sub__umbrella : JoinedOrSeparate<["-"], "sub_umbrella">; - def system_header_prefix : Joined<["--"], "system-header-prefix=">, -diff --git clang/include/clang/Driver/ToolChain.h clang/include/clang/Driver/ToolChain.h -index 2f9c2c190e32..d5b131bcf112 100644 ---- clang/include/clang/Driver/ToolChain.h -+++ clang/include/clang/Driver/ToolChain.h -@@ -99,6 +99,12 @@ public: - RLT_Libgcc - }; - -+ enum UnwindLibType { -+ UNW_None, -+ UNW_CompilerRT, -+ UNW_Libgcc -+ }; -+ - enum RTTIMode { - RM_Enabled, - RM_Disabled, -@@ -352,6 +358,10 @@ public: - return ToolChain::CST_Libstdcxx; - } - -+ virtual UnwindLibType GetDefaultUnwindLibType() const { -+ return ToolChain::UNW_None; -+ } -+ - virtual std::string getCompilerRTPath() const; - - virtual std::string getCompilerRT(const llvm::opt::ArgList &Args, -@@ -484,6 +494,10 @@ public: - // given compilation arguments. - virtual CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const; - -+ // GetUnwindLibType - Determine the unwind library type to use with the -+ // given compilation arguments. -+ virtual UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const; -+ - /// AddClangCXXStdlibIncludeArgs - Add the clang -cc1 level arguments to set - /// the include paths to use for the given C++ standard library type. - virtual void -diff --git clang/lib/Driver/ToolChain.cpp clang/lib/Driver/ToolChain.cpp -index cf3db34688df..d980dd5d23fb 100644 ---- clang/lib/Driver/ToolChain.cpp -+++ clang/lib/Driver/ToolChain.cpp -@@ -665,6 +665,33 @@ ToolChain::RuntimeLibType ToolChain::GetRuntimeLibType( - return GetDefaultRuntimeLibType(); - } - -+ToolChain::UnwindLibType ToolChain::GetUnwindLibType( -+ const ArgList &Args) const { -+ const Arg *A = Args.getLastArg(options::OPT_unwindlib_EQ); -+ StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_UNWINDLIB; -+ -+ if (LibName == "none") -+ return ToolChain::UNW_None; -+ else if (LibName == "platform" || LibName == "") { -+ ToolChain::RuntimeLibType RtLibType = GetRuntimeLibType(Args); -+ if (RtLibType == ToolChain::RLT_CompilerRT) -+ return ToolChain::UNW_None; -+ else if (RtLibType == ToolChain::RLT_Libgcc) -+ return ToolChain::UNW_Libgcc; -+ } else if (LibName == "libunwind") { -+ if (GetRuntimeLibType(Args) == RLT_Libgcc) -+ getDriver().Diag(diag::err_drv_incompatible_unwindlib); -+ return ToolChain::UNW_CompilerRT; -+ } else if (LibName == "libgcc") -+ return ToolChain::UNW_Libgcc; -+ -+ if (A) -+ getDriver().Diag(diag::err_drv_invalid_unwindlib_name) -+ << A->getAsString(Args); -+ -+ return GetDefaultUnwindLibType(); -+} -+ - ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{ - const Arg *A = Args.getLastArg(options::OPT_stdlib_EQ); - StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_CXX_STDLIB; -diff --git clang/test/Driver/compiler-rt-unwind.c clang/test/Driver/compiler-rt-unwind.c -new file mode 100644 -index 000000000000..00024dfa7ed3 ---- /dev/null -+++ clang/test/Driver/compiler-rt-unwind.c -@@ -0,0 +1,49 @@ -+// General tests that the driver handles combinations of --rtlib=XXX and -+// --unwindlib=XXX properly. -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-EMPTY %s -+// RTLIB-EMPTY: "{{.*}}lgcc" -+// RTLIB-EMPTY: "{{.*}}-lgcc_s" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=libgcc \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-GCC %s -+// RTLIB-GCC: "{{.*}}lgcc" -+// RTLIB-GCC: "{{.*}}lgcc_s" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER-RT %s -+// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lgcc" -+// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lunwind" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT %s -+// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s -+// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins-x86_64.a" -+// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}lgcc_s" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \ -+// RUN: -static --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s -+// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins-x86_64.a" -+// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}lgcc_eh" -+// -+// RUN: not %clang -no-canonical-prefixes %s -o %t.o 2> %t.err \ -+// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \ -+// RUN: --gcc-toolchain="" \ -+// RUN: FileCheck --input-file=%t.err --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER_RT %s -+// RTLIB-GCC-UNWINDLIB-COMPILER_RT: "{{[.|\\\n]*}}--rtlib=libgcc requires --unwindlib=libgcc" diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/7/compiler-rt/armv7l.patch deleted file mode 100644 index 89d7f1aec918c..0000000000000 --- a/pkgs/development/compilers/llvm/7/compiler-rt/armv7l.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake ---- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900 -+++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900 -@@ -24,7 +24,7 @@ - - - set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) - set(HEXAGON hexagon) - set(X86 i386) - set(X86_64 x86_64) -diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt ---- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900 -+++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900 -@@ -453,6 +453,7 @@ - set(armv7_SOURCES ${arm_SOURCES}) - set(armv7s_SOURCES ${arm_SOURCES}) - set(armv7k_SOURCES ${arm_SOURCES}) -+set(armv7l_SOURCES ${arm_SOURCES}) - set(arm64_SOURCES ${aarch64_SOURCES}) - - # macho_embedded archs -@@ -563,12 +564,12 @@ - set(_arch ${arch}) - if("${arch}" STREQUAL "armv6m") - set(_arch "arm|armv6m") -- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") -+ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") - set(_arch "arm") - endif() - - # For ARM archs, exclude any VFP builtins if VFP is not supported -- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") -+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") - string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") - check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) - if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/crtbegin-and-end.patch b/pkgs/development/compilers/llvm/7/compiler-rt/crtbegin-and-end.patch deleted file mode 100644 index e63be181f95cc..0000000000000 --- a/pkgs/development/compilers/llvm/7/compiler-rt/crtbegin-and-end.patch +++ /dev/null @@ -1,595 +0,0 @@ -Get crtbegin and crtend without compiler GCC! PR is at https://reviews.llvm.org/D28791 - -Index: compiler-rt/CMakeLists.txt -=================================================================== ---- compiler-rt/CMakeLists.txt -+++ compiler-rt/CMakeLists.txt -@@ -29,6 +29,8 @@ - - option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON) - mark_as_advanced(COMPILER_RT_BUILD_BUILTINS) -+option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON) -+mark_as_advanced(COMPILER_RT_BUILD_CRT) - option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON) - mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS) - option(COMPILER_RT_BUILD_XRAY "Build xray" ON) -Index: compiler-rt/cmake/Modules/AddCompilerRT.cmake -=================================================================== ---- compiler-rt/cmake/Modules/AddCompilerRT.cmake -+++ compiler-rt/cmake/Modules/AddCompilerRT.cmake -@@ -132,7 +132,7 @@ - # Adds static or shared runtime for a list of architectures and operating - # systems and puts it in the proper directory in the build and install trees. - # add_compiler_rt_runtime(<name> --# {STATIC|SHARED} -+# {OBJECT|STATIC|SHARED} - # ARCHS <architectures> - # OS <os list> - # SOURCES <source files> -@@ -144,8 +144,8 @@ - # PARENT_TARGET <convenience parent target> - # ADDITIONAL_HEADERS <header files>) - function(add_compiler_rt_runtime name type) -- if(NOT type MATCHES "^(STATIC|SHARED)$") -- message(FATAL_ERROR "type argument must be STATIC or SHARED") -+ if(NOT type MATCHES "^(OBJECT|STATIC|SHARED)$") -+ message(FATAL_ERROR "type argument must be OBJECT, STATIC or SHARED") - return() - endif() - cmake_parse_arguments(LIB -@@ -204,7 +204,10 @@ - message(FATAL_ERROR "Architecture ${arch} can't be targeted") - return() - endif() -- if(type STREQUAL "STATIC") -+ if(type STREQUAL "OBJECT") -+ set(libname "${name}-${arch}") -+ set(output_name_${libname} ${libname}${COMPILER_RT_OS_SUFFIX}) -+ elseif(type STREQUAL "STATIC") - set(libname "${name}-${arch}") - set_output_name(output_name_${libname} ${name} ${arch}) - else() -@@ -270,12 +273,34 @@ - set(COMPONENT_OPTION COMPONENT ${libname}) - endif() - -- add_library(${libname} ${type} ${sources_${libname}}) -- set_target_compile_flags(${libname} ${extra_cflags_${libname}}) -- set_target_link_flags(${libname} ${extra_link_flags_${libname}}) -- set_property(TARGET ${libname} APPEND PROPERTY -- COMPILE_DEFINITIONS ${LIB_DEFS}) -- set_target_output_directories(${libname} ${output_dir_${libname}}) -+ if(type STREQUAL "OBJECT") -+ string(TOUPPER ${CMAKE_BUILD_TYPE} config) -+ get_property(cflags SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS) -+ separate_arguments(cflags) -+ add_custom_command( -+ OUTPUT ${output_dir_${libname}}/${libname}.o -+ COMMAND ${CMAKE_C_COMPILER} ${sources_${libname}} ${cflags} ${extra_cflags_${libname}} -c -o ${output_dir_${libname}}/${libname}.o -+ DEPENDS ${sources_${libname}} -+ COMMENT "Building C object ${libname}.o") -+ add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${libname}.o) -+ install(FILES ${output_dir_${libname}}/${libname}.o -+ DESTINATION ${install_dir_${libname}} -+ ${COMPONENT_OPTION}) -+ else() -+ add_library(${libname} ${type} ${sources_${libname}}) -+ set_target_compile_flags(${libname} ${extra_cflags_${libname}}) -+ set_target_link_flags(${libname} ${extra_link_flags_${libname}}) -+ set_property(TARGET ${libname} APPEND PROPERTY -+ COMPILE_DEFINITIONS ${LIB_DEFS}) -+ set_target_output_directories(${libname} ${output_dir_${libname}}) -+ install(TARGETS ${libname} -+ ARCHIVE DESTINATION ${install_dir_${libname}} -+ ${COMPONENT_OPTION} -+ LIBRARY DESTINATION ${install_dir_${libname}} -+ ${COMPONENT_OPTION} -+ RUNTIME DESTINATION ${install_dir_${libname}} -+ ${COMPONENT_OPTION}) -+ endif() - set_target_properties(${libname} PROPERTIES - OUTPUT_NAME ${output_name_${libname}}) - set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime") -@@ -299,13 +324,6 @@ - ) - endif() - endif() -- install(TARGETS ${libname} -- ARCHIVE DESTINATION ${install_dir_${libname}} -- ${COMPONENT_OPTION} -- LIBRARY DESTINATION ${install_dir_${libname}} -- ${COMPONENT_OPTION} -- RUNTIME DESTINATION ${install_dir_${libname}} -- ${COMPONENT_OPTION}) - - # We only want to generate per-library install targets if you aren't using - # an IDE because the extra targets get cluttered in IDEs. -Index: compiler-rt/cmake/config-ix.cmake -=================================================================== ---- compiler-rt/cmake/config-ix.cmake -+++ compiler-rt/cmake/config-ix.cmake -@@ -227,6 +227,7 @@ - ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X}) - set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} - ${MIPS32} ${MIPS64} ${PPC64} ${S390X}) -+set(ALL_CRT_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}) - set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64}) - set(ALL_FUZZER_SUPPORTED_ARCH ${X86_64} ${ARM64}) - -@@ -474,6 +475,7 @@ - SANITIZER_COMMON_SUPPORTED_ARCH) - - else() -+ filter_available_targets(CRT_SUPPORTED_ARCH ${ALL_CRT_SUPPORTED_ARCH}) - # Architectures supported by compiler-rt libraries. - filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH - ${ALL_SANITIZER_COMMON_SUPPORTED_ARCH}) -@@ -563,6 +565,12 @@ - - # TODO: Add builtins support. - -+if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux") -+ set(COMPILER_RT_HAS_CRT TRUE) -+else() -+ set(COMPILER_RT_HAS_CRT FALSE) -+endif() -+ - if (COMPILER_RT_HAS_SANITIZER_COMMON AND DFSAN_SUPPORTED_ARCH AND - OS_NAME MATCHES "Linux") - set(COMPILER_RT_HAS_DFSAN TRUE) -Index: compiler-rt/lib/CMakeLists.txt -=================================================================== ---- compiler-rt/lib/CMakeLists.txt -+++ compiler-rt/lib/CMakeLists.txt -@@ -17,6 +17,10 @@ - add_subdirectory(builtins) - endif() - -+if(COMPILER_RT_BUILD_CRT) -+ add_subdirectory(crt) -+endif() -+ - function(compiler_rt_build_runtime runtime) - string(TOUPPER ${runtime} runtime_uppercase) - if(COMPILER_RT_HAS_${runtime_uppercase}) -Index: compiler-rt/lib/crt/CMakeLists.txt -=================================================================== ---- /dev/null -+++ compiler-rt/lib/crt/CMakeLists.txt -@@ -0,0 +1,102 @@ -+add_compiler_rt_component(crt) -+ -+function(check_cxx_section_exists section output) -+ cmake_parse_arguments(ARG "" "" "SOURCE;FLAGS" ${ARGN}) -+ if(NOT ARG_SOURCE) -+ set(ARG_SOURCE "int main() { return 0; }\n") -+ endif() -+ -+ string(RANDOM TARGET_NAME) -+ set(TARGET_NAME "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmTC_${TARGET_NAME}.dir") -+ file(MAKE_DIRECTORY ${TARGET_NAME}) -+ -+ file(WRITE "${TARGET_NAME}/CheckSectionExists.c" "${ARG_SOURCE}\n") -+ -+ string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions -+ ${CMAKE_C_COMPILE_OBJECT}) -+ -+ set(try_compile_flags "${ARG_FLAGS}") -+ if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET) -+ list(APPEND try_compile_flags "-target ${CMAKE_C_COMPILER_TARGET}") -+ endif() -+ -+ string(REPLACE ";" " " extra_flags "${try_compile_flags}") -+ -+ set(test_compile_command "${CMAKE_C_COMPILE_OBJECT}") -+ foreach(substitution ${substitutions}) -+ if(substitution STREQUAL "<CMAKE_C_COMPILER>") -+ string(REPLACE "<CMAKE_C_COMPILER>" -+ "${CMAKE_C_COMPILER}" test_compile_command ${test_compile_command}) -+ elseif(substitution STREQUAL "<OBJECT>") -+ string(REPLACE "<OBJECT>" "${TARGET_NAME}/CheckSectionExists.o" -+ test_compile_command ${test_compile_command}) -+ elseif(substitution STREQUAL "<SOURCE>") -+ string(REPLACE "<SOURCE>" "${TARGET_NAME}/CheckSectionExists.c" -+ test_compile_command ${test_compile_command}) -+ elseif(substitution STREQUAL "<FLAGS>") -+ string(REPLACE "<FLAGS>" "${CMAKE_C_FLAGS} ${extra_flags}" -+ test_compile_command ${test_compile_command}) -+ else() -+ string(REPLACE "${substitution}" "" test_compile_command -+ ${test_compile_command}) -+ endif() -+ endforeach() -+ -+ string(REPLACE " " ";" test_compile_command "${test_compile_command}") -+ -+ execute_process( -+ COMMAND ${test_compile_command} -+ RESULT_VARIABLE TEST_RESULT -+ OUTPUT_VARIABLE TEST_OUTPUT -+ ERROR_VARIABLE TEST_ERROR -+ ) -+ -+ execute_process( -+ COMMAND ${CMAKE_OBJDUMP} -h "${TARGET_NAME}/CheckSectionExists.o" -+ RESULT_VARIABLE CHECK_RESULT -+ OUTPUT_VARIABLE CHECK_OUTPUT -+ ERROR_VARIABLE CHECK_ERROR -+ ) -+ string(FIND "${CHECK_OUTPUT}" "${section}" SECTION_FOUND) -+ -+ if(NOT SECTION_FOUND EQUAL -1) -+ set(${output} TRUE PARENT_SCOPE) -+ else() -+ set(${output} FALSE PARENT_SCOPE) -+ endif() -+ -+ file(REMOVE_RECURSE ${TARGET_NAME}) -+endfunction() -+ -+check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY -+ SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n") -+ -+append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS) -+append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS) -+ -+foreach(arch ${CRT_SUPPORTED_ARCH}) -+ add_compiler_rt_runtime(clang_rt.crtbegin -+ OBJECT -+ ARCHS ${arch} -+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c -+ CFLAGS ${CRT_CFLAGS} -+ PARENT_TARGET crt) -+ add_compiler_rt_runtime(clang_rt.crtbegin_shared -+ OBJECT -+ ARCHS ${arch} -+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c -+ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -+ PARENT_TARGET crt) -+ add_compiler_rt_runtime(clang_rt.crtend -+ OBJECT -+ ARCHS ${arch} -+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c -+ CFLAGS ${CRT_CFLAGS} -+ PARENT_TARGET crt) -+ add_compiler_rt_runtime(clang_rt.crtend_shared -+ OBJECT -+ ARCHS ${arch} -+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c -+ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -+ PARENT_TARGET crt) -+endforeach() -Index: compiler-rt/lib/crt/crtbegin.c -=================================================================== ---- /dev/null -+++ compiler-rt/lib/crt/crtbegin.c -@@ -0,0 +1,108 @@ -+/* ===-- crtbegin.c - Start of constructors and destructors ----------------=== -+ * -+ * The LLVM Compiler Infrastructure -+ * -+ * This file is dual licensed under the MIT and the University of Illinois Open -+ * Source Licenses. See LICENSE.TXT for details. -+ * -+ * ===----------------------------------------------------------------------=== -+ */ -+ -+#include <stddef.h> -+ -+__attribute__((visibility("hidden"))) -+#ifdef CRT_SHARED -+void *__dso_handle = &__dso_handle; -+#else -+void *__dso_handle = (void *)0; -+#endif -+ -+static long __EH_FRAME_LIST__[] -+ __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {}; -+ -+extern void __register_frame_info(const void *, void *) __attribute__((weak)); -+extern void *__deregister_frame_info(const void *) __attribute__((weak)); -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+typedef void (*fp)(void); -+ -+static fp __CTOR_LIST__[] -+ __attribute__((section(".ctors"), aligned(sizeof(fp)), used)) = {(fp)-1}; -+extern fp __CTOR_LIST_END__[]; -+#endif -+ -+#ifdef CRT_SHARED -+extern void __cxa_finalize(void *) __attribute__((weak)); -+#endif -+ -+static void __attribute__((used)) __do_init() { -+ static _Bool __initialized; -+ if (__builtin_expect(__initialized, 0)) -+ return; -+ __initialized = 1; -+ -+ static struct { void *p[8]; } __object; -+ if (__register_frame_info) -+ __register_frame_info(__EH_FRAME_LIST__, &__object); -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+ const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1; -+ for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i](); -+#endif -+} -+ -+#ifdef CRT_HAS_INITFINI_ARRAY -+__attribute__((section(".init_array"), -+ used)) static void (*__init)(void) = __do_init; -+#else // CRT_HAS_INITFINI_ARRAY -+#if defined(__i386__) || defined(__x86_64__) -+asm(".pushsection .init,\"ax\",@progbits\n\t" -+ "call " __USER_LABEL_PREFIX__ "__do_init\n\t" -+ ".popsection"); -+#elif defined(__arm__) -+asm(".pushsection .init,\"ax\",%progbits\n\t" -+ "bl " __USER_LABEL_PREFIX__ "__do_init\n\t" -+ ".popsection"); -+#endif // CRT_HAS_INITFINI_ARRAY -+#endif -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+static fp __DTOR_LIST__[] -+ __attribute__((section(".dtors"), aligned(sizeof(fp)), used)) = {(fp)-1}; -+extern fp __DTOR_LIST_END__[]; -+#endif -+ -+static void __attribute__((used)) __do_fini() { -+ static _Bool __finalized; -+ if (__builtin_expect(__finalized, 0)) -+ return; -+ __finalized = 1; -+ -+#ifdef CRT_SHARED -+ if (__cxa_finalize) -+ __cxa_finalize(__dso_handle); -+#endif -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+ if (__deregister_frame_info) -+ __deregister_frame_info(__EH_FRAME_LIST__); -+ -+ const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1; -+ for (size_t i = 1; i < n; i++) __DTOR_LIST__[i](); -+#endif -+} -+ -+#ifdef CRT_HAS_INITFINI_ARRAY -+__attribute__((section(".fini_array"), -+ used)) static void (*__fini)(void) = __do_fini; -+#else // CRT_HAS_INITFINI_ARRAY -+#if defined(__i386__) || defined(__x86_64__) -+asm(".pushsection .fini,\"ax\",@progbits\n\t" -+ "call " __USER_LABEL_PREFIX__ "__do_fini\n\t" -+ ".popsection"); -+#elif defined(__arm__) -+asm(".pushsection .fini,\"ax\",%progbits\n\t" -+ "bl " __USER_LABEL_PREFIX__ "__do_fini\n\t" -+ ".popsection"); -+#endif -+#endif // CRT_HAS_INIT_FINI_ARRAY -Index: compiler-rt/lib/crt/crtend.c -=================================================================== ---- /dev/null -+++ compiler-rt/lib/crt/crtend.c -@@ -0,0 +1,24 @@ -+/* ===-- crtend.c - End of constructors and destructors --------------------=== -+ * -+ * The LLVM Compiler Infrastructure -+ * -+ * This file is dual licensed under the MIT and the University of Illinois Open -+ * Source Licenses. See LICENSE.TXT for details. -+ * -+ * ===----------------------------------------------------------------------=== -+ */ -+ -+#include <stdint.h> -+ -+// Put 4-byte zero which is the length field in FDE at the end as a terminator. -+const int32_t __EH_FRAME_LIST_END__[] -+ __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)), -+ visibility("hidden"), used)) = {0}; -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+typedef void (*fp)(void); -+fp __CTOR_LIST_END__[] -+ __attribute__((section(".ctors"), visibility("hidden"), used)) = {0}; -+fp __DTOR_LIST_END__[] -+ __attribute__((section(".dtors"), visibility("hidden"), used)) = {0}; -+#endif -Index: compiler-rt/test/CMakeLists.txt -=================================================================== ---- compiler-rt/test/CMakeLists.txt -+++ compiler-rt/test/CMakeLists.txt -@@ -73,6 +73,9 @@ - if(COMPILER_RT_BUILD_XRAY) - compiler_rt_test_runtime(xray) - endif() -+ if(COMPILER_RT_HAS_CRT) -+ add_subdirectory(crt) -+ endif() - # ShadowCallStack does not yet provide a runtime with compiler-rt, the tests - # include their own minimal runtime - add_subdirectory(shadowcallstack) -Index: compiler-rt/test/crt/CMakeLists.txt -=================================================================== ---- /dev/null -+++ compiler-rt/test/crt/CMakeLists.txt -@@ -0,0 +1,31 @@ -+set(CRT_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -+ -+set(CRT_TESTSUITES) -+ -+set(CRT_TEST_DEPS "") -+ -+if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_BUILD_CRT AND -+ COMPILER_RT_HAS_CRT) -+ list(APPEND CRT_TEST_DEPS crt) -+endif() -+ -+set(CRT_TEST_ARCH ${CRT_SUPPORTED_ARCH}) -+if (COMPILER_RT_BUILD_CRT AND COMPILER_RT_HAS_CRT) -+ foreach(arch ${CRT_TEST_ARCH}) -+ set(CRT_TEST_TARGET_ARCH ${arch}) -+ string(TOLOWER "-${arch}-${OS_NAME}" CRT_TEST_CONFIG_SUFFIX) -+ get_test_cc_for_arch(${arch} CRT_TEST_TARGET_CC CRT_TEST_TARGET_CFLAGS) -+ string(TOUPPER ${arch} ARCH_UPPER_CASE) -+ set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) -+ -+ configure_lit_site_cfg( -+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -+ ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) -+ list(APPEND CRT_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) -+ endforeach() -+endif() -+ -+add_lit_testsuite(check-crt "Running the CRT tests" -+ ${CRT_TESTSUITES} -+ DEPENDS ${CRT_TEST_DEPS}) -+set_target_properties(check-crt PROPERTIES FOLDER "Compiler-RT Misc") -Index: compiler-rt/test/crt/dso_handle.cpp -=================================================================== ---- /dev/null -+++ compiler-rt/test/crt/dso_handle.cpp -@@ -0,0 +1,33 @@ -+// RUN: %clangxx -g -DCRT_SHARED -c %s -fPIC -o %tshared.o -+// RUN: %clangxx -g -c %s -fPIC -o %t.o -+// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %shared_crtbegin %tshared.o %libstdcxx -lc -lm -lgcc_s %shared_crtend %crtn -+// RUN: %clangxx -g -o %t -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn -+// RUN: %run %t 2>&1 | FileCheck %s -+ -+#include <stdio.h> -+ -+// CHECK: 1 -+// CHECK-NEXT: ~A() -+ -+#ifdef CRT_SHARED -+bool G; -+void C() { -+ printf("%d\n", G); -+} -+ -+struct A { -+ A() { G = true; } -+ ~A() { -+ printf("~A()\n"); -+ } -+}; -+ -+A a; -+#else -+void C(); -+ -+int main() { -+ C(); -+ return 0; -+} -+#endif -Index: compiler-rt/test/crt/lit.cfg -=================================================================== ---- /dev/null -+++ compiler-rt/test/crt/lit.cfg -@@ -0,0 +1,80 @@ -+# -*- Python -*- -+ -+import os -+import subprocess -+ -+# Setup config name. -+config.name = 'CRT' + config.name_suffix -+ -+# Setup source root. -+config.test_source_root = os.path.dirname(__file__) -+ -+ -+def get_library_path(file): -+ cmd = subprocess.Popen([config.clang.strip(), -+ config.target_cflags.strip(), -+ '-print-file-name=%s' % file], -+ stdout=subprocess.PIPE, -+ env=config.environment) -+ if not cmd.stdout: -+ lit_config.fatal("Couldn't find the library path for '%s'" % file) -+ dir = cmd.stdout.read().strip() -+ if sys.platform in ['win32'] and execute_external: -+ # Don't pass dosish path separator to msys bash.exe. -+ dir = dir.replace('\\', '/') -+ # Ensure the result is an ascii string, across Python2.5+ - Python3. -+ return str(dir.decode('ascii')) -+ -+ -+def get_libgcc_file_name(): -+ cmd = subprocess.Popen([config.clang.strip(), -+ config.target_cflags.strip(), -+ '-print-libgcc-file-name'], -+ stdout=subprocess.PIPE, -+ env=config.environment) -+ if not cmd.stdout: -+ lit_config.fatal("Couldn't find the library path for '%s'" % file) -+ dir = cmd.stdout.read().strip() -+ if sys.platform in ['win32'] and execute_external: -+ # Don't pass dosish path separator to msys bash.exe. -+ dir = dir.replace('\\', '/') -+ # Ensure the result is an ascii string, across Python2.5+ - Python3. -+ return str(dir.decode('ascii')) -+ -+ -+def build_invocation(compile_flags): -+ return ' ' + ' '.join([config.clang] + compile_flags) + ' ' -+ -+ -+# Setup substitutions. -+config.substitutions.append( -+ ('%clang ', build_invocation([config.target_cflags]))) -+config.substitutions.append( -+ ('%clangxx ', -+ build_invocation(config.cxx_mode_flags + [config.target_cflags]))) -+ -+base_lib = os.path.join( -+ config.compiler_rt_libdir, "clang_rt.%%s-%s.o" % config.target_arch) -+config.substitutions.append(('%crtbegin', base_lib % "crtbegin")) -+config.substitutions.append(('%shared_crtbegin', base_lib % "crtbegin_shared")) -+config.substitutions.append(('%crtend', base_lib % "crtend")) -+config.substitutions.append(('%shared_crtend', base_lib % "crtend_shared")) -+ -+config.substitutions.append( -+ ('%crt1', get_library_path('crt1.o'))) -+config.substitutions.append( -+ ('%crti', get_library_path('crti.o'))) -+config.substitutions.append( -+ ('%crtn', get_library_path('crtn.o'))) -+ -+config.substitutions.append( -+ ('%libgcc', get_libgcc_file_name())) -+ -+config.substitutions.append( -+ ('%libstdcxx', '-l' + config.sanitizer_cxx_lib.lstrip('lib'))) -+ -+# Default test suffixes. -+config.suffixes = ['.c', '.cc', '.cpp'] -+ -+if config.host_os not in ['Linux']: -+ config.unsupported = True -Index: compiler-rt/test/crt/lit.site.cfg.in -=================================================================== ---- /dev/null -+++ compiler-rt/test/crt/lit.site.cfg.in -@@ -0,0 +1,14 @@ -+@LIT_SITE_CFG_IN_HEADER@ -+ -+# Tool-specific config options. -+config.name_suffix = "@CRT_TEST_CONFIG_SUFFIX@" -+config.crt_lit_source_dir = "@CRT_LIT_SOURCE_DIR@" -+config.target_cflags = "@CRT_TEST_TARGET_CFLAGS@" -+config.target_arch = "@CRT_TEST_TARGET_ARCH@" -+config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@" -+ -+# Load common config for all compiler-rt lit tests -+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") -+ -+# Load tool-specific config that would do the real work. -+lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg") diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix deleted file mode 100644 index 7354397d2bf0f..0000000000000 --- a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi -, doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD -}: - -let - - useLLVM = stdenv.hostPlatform.useLLVM or false; - bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; - haveLibc = stdenv.cc.libc != null; - inherit (stdenv.hostPlatform) isMusl; - -in - -stdenv.mkDerivation { - pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc"; - inherit version; - src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; - - nativeBuildInputs = [ cmake python3 libllvm.dev ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - - env.NIX_CFLAGS_COMPILE = toString [ - "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ]; - - cmakeFlags = [ - "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" - "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" - "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - ] ++ lib.optionals (useLLVM || bareMetal) [ - "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ - "-DCMAKE_C_COMPILER_WORKS=ON" - "-DCMAKE_CXX_COMPILER_WORKS=ON" - "-DCOMPILER_RT_BAREMETAL_BUILD=ON" - "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ lib.optionals (useLLVM) [ - "-DCOMPILER_RT_BUILD_BUILTINS=ON" - #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program - "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ lib.optionals (bareMetal) [ - "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - # The compiler-rt build infrastructure sniffs supported platforms on Darwin - # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails - # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" - ]; - - outputs = [ "out" "dev" ]; - - patches = [ - # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce - ../../common/compiler-rt/glibc.patch - ../../common/compiler-rt/7-12-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./gnu-install-dirs.patch - ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch - ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch - ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; - - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. - postPatch = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace cmake/builtin-config-ix.cmake \ - --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + lib.optionalString (useLLVM) '' - substituteInPlace lib/builtins/int_util.c \ - --replace "#include <stdlib.h>" "" - substituteInPlace lib/builtins/clear_cache.c \ - --replace "#include <assert.h>" "" - substituteInPlace lib/builtins/cpu_model.c \ - --replace "#include <assert.h>" "" - ''; - - preConfigure = lib.optionalString (useLLVM && !haveLibc) '' - cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding") - ''; - - # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' - ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' - ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o - ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o - ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o - ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o - '' + lib.optionalString doFakeLibgcc '' - ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/libgcc.a - ''; - - meta = llvm_meta // { - homepage = "https://compiler-rt.llvm.org/"; - description = "Compiler runtime libraries"; - longDescription = '' - The compiler-rt project provides highly tuned implementations of the - low-level code generator support routines like "__fixunsdfdi" and other - calls generated when a target doesn't have a short sequence of native - instructions to implement a core IR operation. It also provides - implementations of run-time libraries for dynamic testing tools such as - AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. - ''; - # "All of the code in the compiler-rt project is dual licensed under the MIT - # license and the UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch deleted file mode 100644 index 41b501ec6497d..0000000000000 --- a/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 86ca2b3ef74b..555103bd97fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.4.3) - # Check if compiler-rt is built as a standalone project. - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) - project(CompilerRT C CXX ASM) -+ include(GNUInstallDirs) - set(COMPILER_RT_STANDALONE_BUILD TRUE) - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - endif() -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index cd4c704fc824..5abcd1260381 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -478,7 +478,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) - add_custom_target(${target_name} DEPENDS ${dst_file}) - # Install in Clang resource directory. - install(FILES ${file_name} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} - COMPONENT ${component}) - add_dependencies(${component} ${target_name}) - -@@ -495,7 +495,7 @@ macro(add_compiler_rt_script name) - add_custom_target(${name} DEPENDS ${dst}) - install(FILES ${dst} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) - endmacro(add_compiler_rt_script src name) - - # Builds custom version of libc++ and installs it in <prefix>. -diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake -index 04cc955980fa..a99f6dfb2f82 100644 ---- a/cmake/Modules/CompilerRTDarwinUtils.cmake -+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake -@@ -377,7 +377,7 @@ macro(darwin_add_embedded_builtin_libraries) - set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) - set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) - - set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") - set(CFLAGS_i386 "-march=pentium") -diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake -index e5651718fa34..d95cfc984a85 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -330,7 +330,7 @@ endfunction() - function(get_compiler_rt_install_dir arch install_dir) - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - get_compiler_rt_target(${arch} target) -- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${target}/lib PARENT_SCOPE) -+ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${target}/${CMAKE_INSTALL_FULL_LIBDIR} PARENT_SCOPE) - else() - set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) - endif() -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index 91fe2494b476..b59a0ffc69f4 100644 ---- a/cmake/base-config-ix.cmake -+++ b/cmake/base-config-ix.cmake -@@ -53,11 +53,11 @@ if (LLVM_TREE_AVAILABLE) - else() - # Take output dir and install path from the user. - set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH -- "Path where built compiler-rt libraries should be stored.") -+ "Path where built compiler-rt build artifacts should be stored.") - set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH - "Path where built compiler-rt executables should be stored.") -- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH -- "Path where built compiler-rt libraries should be installed.") -+ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH -+ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) - # Use a host compiler to compile/link tests. -@@ -85,7 +85,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) - set(COMPILER_RT_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) - set(COMPILER_RT_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - endif() - - if(APPLE) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index c4b93b89a30c..3913dc3a1ee6 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -48,12 +48,12 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") - install(FILES ${SANITIZER_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) - # Install xray headers. - install(FILES ${XRAY_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) - - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. - add_custom_target(install-compiler-rt-headers -diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt -index b3ae713cf02c..52b364b900f5 100644 ---- a/lib/dfsan/CMakeLists.txt -+++ b/lib/dfsan/CMakeLists.txt -@@ -54,4 +54,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} - DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) - add_dependencies(dfsan dfsan_abilist) - install(FILES ${dfsan_abilist_filename} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix deleted file mode 100644 index 972d52ac6e1a4..0000000000000 --- a/pkgs/development/compilers/llvm/7/default.nix +++ /dev/null @@ -1,273 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake -, preLibcCrossHeaders -, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -}: - -let - release_version = "7.1.0"; - version = release_version; # differentiating these is important for rc's - - fetch = name: sha256: fetchurl { - url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; - inherit sha256; - }; - - clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w"; - - inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ./llvm { - inherit llvm_meta; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libllvm-polly = callPackage ./llvm { - inherit llvm_meta; - enablePolly = true; - }; - - llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; }; - - libclang = callPackage ./clang { - inherit clang-tools-extra_src llvm_meta; - }; - - clang-unwrapped = tools.libclang; - - clang-polly-unwrapped = callPackage ./clang { - inherit llvm_meta; - inherit clang-tools-extra_src; - libllvm = tools.libllvm-polly; - enablePolly = true; - }; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - libcxx.cxxabi - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ./lld { - inherit llvm_meta; - }; - - lldb = callPackage ./lldb { - inherit llvm_meta; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - libcxx.cxxabi - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' - echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' - echo "-lunwind" >> $out/nix-support/cc-ldflags - '' + lib.optionalString stdenv.targetPlatform.isWasm '' - echo "-fno-exceptions" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - echo "-nostdlib++" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = '' - echo "-nostartfiles" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands0 cc; - }; - - clangNoCompilerRtWithLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - }; - - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - in { - - compiler-rt-libc = callPackage ./compiler-rt { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ./compiler-rt { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = - if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isDarwin) - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libcxx { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; - }; - - libcxxabi = callPackage ./libcxxabi { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; - }; - - libunwind = callPackage ./libunwind { - inherit llvm_meta; - inherit (buildLlvmTools) llvm; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; - }; - - openmp = callPackage ./openmp { - inherit llvm_meta targetLlvm; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/7/libcxx/default.nix b/pkgs/development/compilers/llvm/7/libcxx/default.nix deleted file mode 100644 index 3834e17fb8dde..0000000000000 --- a/pkgs/development/compilers/llvm/7/libcxx/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version -, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi -, libcxxabi, libcxxrt -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; - -stdenv.mkDerivation { - pname = "libcxx"; - inherit version; - - src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" - ''; - - outputs = [ "out" "dev" ]; - - patches = [ - ./gnu-install-dirs.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch - ]; - - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - - prePatch = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patchShebangs utils/cat_files.py - ''; - - nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.hostPlatform.isMusl python3 - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ cxxabi ]; - - cmakeFlags = [ - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=${cxxabi.pname}" - ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" - ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; - - preInstall = lib.optionalString (stdenv.isDarwin) '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) - installName="$out/lib/$baseName" - abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') - - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file - done - done - ''; - - passthru = { - isLLVM = true; - inherit cxxabi; - }; - - meta = llvm_meta // { - homepage = "https://libcxx.llvm.org/"; - description = "C++ standard library"; - longDescription = '' - libc++ is an implementation of the C++ standard library, targeting C++11, - C++14 and above. - ''; - # "All of the code in libc++ is dual licensed under the MIT license and the - # UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/llvm/7/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/libcxx/gnu-install-dirs.patch deleted file mode 100644 index 910e5287a866c..0000000000000 --- a/pkgs/development/compilers/llvm/7/libcxx/gnu-install-dirs.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index acb49565ce97..6a863926cbca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,6 +26,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxx CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 7.0.0) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index 1c19d7e01af7..9c8aee8e8bb7 100644 ---- a/cmake/Modules/HandleLibCXXABI.cmake -+++ b/cmake/Modules/HandleLibCXXABI.cmake -@@ -59,7 +59,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) - - if (LIBCXX_INSTALL_HEADERS) - install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} - COMPONENT cxx-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index d9def18d725c..16494dacaf6f 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -243,7 +243,7 @@ if (LIBCXX_INSTALL_HEADERS) - foreach(file ${files}) - get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} - COMPONENT cxx-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -@@ -252,7 +252,7 @@ if (LIBCXX_INSTALL_HEADERS) - if (LIBCXX_NEEDS_SITE_CONFIG) - # Install the generated header as __config. - install(FILES ${LIBCXX_BINARY_DIR}/__generated_config -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - RENAME __config - COMPONENT cxx-headers) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index e068edc8a7af..b63ad92d1d78 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -399,8 +399,8 @@ if (LIBCXX_INSTALL_LIBRARY) - set(experimental_lib cxx_experimental) - endif() - install(TARGETS ${LIBCXX_INSTALL_TARGETS} ${filesystem_lib} ${experimental_lib} -- LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -- ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx - ) - # NOTE: This install command must go after the cxx install command otherwise - # it will not be executed after the library symlinks are installed. -@@ -408,7 +408,7 @@ if (LIBCXX_INSTALL_LIBRARY) - # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx> - # after we required CMake 3.0. - install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" -- DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} - COMPONENT libcxx) - endif() - endif() diff --git a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix deleted file mode 100644 index c33c61361e2ab..0000000000000 --- a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version -, fetchpatch -, standalone ? stdenv.hostPlatform.useLLVM or false -, withLibunwind ? !stdenv.isDarwin && !stdenv.hostPlatform.isWasm - # on musl the shared objects don't build -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation { - pname = "libcxxabi"; - inherit version; - - src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2"; - - outputs = [ "out" "dev" ]; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - cmakeFlagsArray=($cmakeFlagsArray -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*) ) - '' + lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} - '' + lib.optionalString (!stdenv.cc.isClang) '' - pushd libcxx-* - patch -p2 < ${fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/76ccec07b4fa0cc68dfd07d557e7fb661804a468.patch"; - sha256 = "1lgzkfkp7qinfc6gd8x5di1iq1gqdv81249c6f02chn9q122sbq1"; - }} - popd - ''; - - patches = [ - ./gnu-install-dirs.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional withLibunwind libunwind; - - cmakeFlags = lib.optionals standalone [ - "-DLLVM_ENABLE_LIBCXX=ON" - ] ++ lib.optionals (standalone && withLibunwind) [ - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; - - preInstall = lib.optionalString stdenv.isDarwin '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" - - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - ${stdenv.cc.targetPrefix}install_name_tool -id $installName $file - - # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes - # libcxxabi to sometimes link against a different version of itself. - # Here we simply make that second reference point to ourselves. - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file - done - done - ''; - - postInstall = '' - mkdir -p "$dev/include" - install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" - ''; - - passthru = { - libName = "c++abi"; - }; - - meta = llvm_meta // { - homepage = "https://libcxxabi.llvm.org/"; - description = "Provides C++ standard library support"; - longDescription = '' - libc++abi is a new implementation of low level support for a standard C++ library. - ''; - # "All of the code in libc++abi is dual licensed under the MIT license and - # the UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; - }; -} diff --git a/pkgs/development/compilers/llvm/7/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/libcxxabi/gnu-install-dirs.patch deleted file mode 100644 index 92d9e94fdee7d..0000000000000 --- a/pkgs/development/compilers/llvm/7/libcxxabi/gnu-install-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d6648ede1f59..55a8f17ca5e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxxabi CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 7.0.0svn) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 776c51294330..314b45feac69 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -195,8 +195,8 @@ add_custom_target(cxxabi DEPENDS ${LIBCXXABI_BUILD_TARGETS}) - - if (LIBCXXABI_INSTALL_LIBRARY) - install(TARGETS ${LIBCXXABI_INSTALL_TARGETS} -- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi - ) - endif() - diff --git a/pkgs/development/compilers/llvm/7/libunwind/default.nix b/pkgs/development/compilers/llvm/7/libunwind/default.nix deleted file mode 100644 index 426895029b3eb..0000000000000 --- a/pkgs/development/compilers/llvm/7/libunwind/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, llvm_meta, version, fetch, fetchpatch, cmake, llvm -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "libunwind"; - inherit version; - - src = fetch pname "035dsxs10nyiqd00q07yycvmkjl01yz4jdlrjvmch8klxg4pyjhp"; - - postUnpack = '' - unpackFile ${llvm.src} - cmakeFlagsArray=($cmakeFlagsArray -DLLVM_PATH=$PWD/$(ls -d llvm-*)) - ''; - - patches = [ - ./gnu-install-dirs.patch - ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ - # removes use of `new` that require libc++ - (fetchpatch { - url = "https://github.com/llvm-mirror/libunwind/commit/34a45c630d4c79af403661d267db42fbe7de1178.patch"; - sha256 = "0n0pv6jvcky8pn3srhrf9x5kbnd0d2kia9xlx2g590f5q0bgwfhv"; - }) - # cleans up remaining libc++ dependencies (mostly header inclusions) - (fetchpatch { - url = "https://github.com/llvm-mirror/libunwind/commit/e050272d2eb57eb4e56a37b429a61df2ebb8aa3e.patch"; - sha256 = "170mwmj0wf40iyk1kzdpaiy36rz9n8dpl881h4h7s5da0rh51xya"; - includes = [ "src/libunwind.cpp" "src/UnwindCursor.hpp" ]; - }) - ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = lib.optionals (!enableShared) [ - "-DLIBUNWIND_ENABLE_SHARED=OFF" - ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ - "-DLLVM_ENABLE_LIBCXX=ON" - ]; - - meta = llvm_meta // { - # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst - homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; - description = "LLVM's unwinder library"; - longDescription = '' - The unwind library provides a family of _Unwind_* functions implementing - the language-neutral stack unwinding portion of the Itanium C++ ABI (Level - I). It is a dependency of the C++ ABI library, and sometimes is a - dependency of other runtimes. - ''; - }; -} diff --git a/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch deleted file mode 100644 index 21d4fa80ea13d..0000000000000 --- a/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0e48d713837a..05483c367bd1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,6 +18,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libunwind) - -+ include(GNUInstallDirs) -+ - # Rely on llvm-config. - set(CONFIG_OUTPUT) - if(NOT LLVM_CONFIG_PATH) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 937159e2cb86..07f8b936e7e5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -141,8 +141,8 @@ add_custom_target(unwind DEPENDS ${LIBUNWIND_BUILD_TARGETS}) - - if (LIBUNWIND_INSTALL_LIBRARY) - install(TARGETS ${LIBUNWIND_INSTALL_TARGETS} -- LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind -- ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) -+ LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind -+ ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) - endif() - - if (NOT CMAKE_CONFIGURATION_TYPES AND LIBUNWIND_INSTALL_LIBRARY) diff --git a/pkgs/development/compilers/llvm/7/lld/default.nix b/pkgs/development/compilers/llvm/7/lld/default.nix deleted file mode 100644 index 2016e6321e0ff..0000000000000 --- a/pkgs/development/compilers/llvm/7/lld/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, llvm_meta -, buildLlvmTools -, fetch -, cmake -, libxml2 -, libllvm -, version -}: - -stdenv.mkDerivation rec { - pname = "lld"; - inherit version; - - src = fetch pname "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1"; - - patches = [ - ./gnu-install-dirs.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libllvm libxml2 ]; - - cmakeFlags = [ - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ]; - - # Musl's default stack size is too small for lld to be able to link Firefox. - LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; - - outputs = [ "out" "lib" "dev" ]; - - meta = llvm_meta // { - homepage = "https://lld.llvm.org/"; - description = "The LLVM linker (unwrapped)"; - longDescription = '' - LLD is a linker from the LLVM project that is a drop-in replacement for - system linkers and runs much faster than them. It also provides features - that are useful for toolchain developers. - The linker supports ELF (Unix), PE/COFF (Windows), and Mach-O (macOS) - in descending order of completeness. Internally, LLD consists - of several different linkers. - ''; - }; -} diff --git a/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch deleted file mode 100644 index acc2d3d47760b..0000000000000 --- a/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2fbdbfbbb47..d601b231ebb8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) - -+ include(GNUInstallDirs) -+ - find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") - if(NOT LLVM_CONFIG_PATH) - message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") -@@ -203,7 +205,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index fa48b428d26b..e7967aad3ceb 100644 ---- a/cmake/modules/AddLLD.cmake -+++ b/cmake/modules/AddLLD.cmake -@@ -20,9 +20,9 @@ macro(add_lld_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_lldtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -54,7 +54,7 @@ macro(add_lld_tool name) - - install(TARGETS ${name} - ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -69,5 +69,5 @@ endmacro() - macro(add_lld_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt -index d8829493fc22..df748a0e749b 100644 ---- a/tools/lld/CMakeLists.txt -+++ b/tools/lld/CMakeLists.txt -@@ -16,7 +16,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld) diff --git a/pkgs/development/compilers/llvm/7/lldb/default.nix b/pkgs/development/compilers/llvm/7/lldb/default.nix deleted file mode 100644 index 02e3cdcb8eb9a..0000000000000 --- a/pkgs/development/compilers/llvm/7/lldb/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib, stdenv, llvm_meta -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, perl -, python3 -, version -, darwin -}: - -stdenv.mkDerivation rec { - pname = "lldb"; - inherit version; - - src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v"; - - patches = [ - ./gnu-install-dirs.patch - ]; - - postPatch = '' - # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${libclang.dev}/lib/cmake/clang/ClangConfig.cmake",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${libclang.dev}/include",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ - cmake/modules/LLDBStandalone.cmake - sed -i -e 's,message(SEND_ERROR "Cannot find debugserver on system."),,' \ - -e 's,string(STRIP ''${XCODE_DEV_DIR} XCODE_DEV_DIR),,' \ - tools/debugserver/source/CMakeLists.txt - - # Fix /usr/bin references for sandboxed builds. - patchShebangs scripts - ''; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake perl python3 which swig - ]; - - buildInputs = [ - ncurses zlib libedit libxml2 libllvm - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation - darwin.bootstrap_cmds - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.DebugSymbols - ]; - - CXXFLAGS = "-fno-rtti"; - hardeningDisable = [ "format" ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - "-DSKIP_DEBUGSERVER=ON" - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - postInstall = '' - mkdir -p $out/share/man/man1 - cp ../docs/lldb.1 $out/share/man/man1/ - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch deleted file mode 100644 index 40645743ecc78..0000000000000 --- a/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 00ddcdc1488f..af2aa238939a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" - ) - -+include(GNUInstallDirs) -+ - include(LLDBStandalone) - include(LLDBConfig) - include(AddLLDB) -diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake -index 129a5ef7500d..fb3fb3ce655c 100644 ---- a/cmake/modules/AddLLDB.cmake -+++ b/cmake/modules/AddLLDB.cmake -@@ -56,14 +56,14 @@ function(add_lldb_library name) - endif() - install(TARGETS ${name} - COMPONENT ${name} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${out_dir} - ARCHIVE DESTINATION ${out_dir}) - else() - install(TARGETS ${name} - COMPONENT ${name} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - if (NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -121,7 +121,7 @@ function(add_lldb_executable name) - endif() - - if(ARG_GENERATE_INSTALL) -- set(out_dir "bin") -+ set(out_dir "${CMAKE_INSTALL_BINDIR}") - if (LLDB_BUILD_FRAMEWORK AND ARG_INCLUDE_IN_SUITE) - set(out_dir ${LLDB_FRAMEWORK_INSTALL_DIR}/${LLDB_FRAMEWORK_RESOURCE_DIR}) - endif() -diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake -index dae6e365da38..ef272d5de5c0 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -278,7 +278,7 @@ include_directories(BEFORE - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -@@ -288,7 +288,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt -index b5316540fdf3..3c3c882d503f 100644 ---- a/tools/intel-features/CMakeLists.txt -+++ b/tools/intel-features/CMakeLists.txt -@@ -64,4 +64,4 @@ if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT) - endif() - - install(TARGETS lldbIntelFeatures -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix deleted file mode 100644 index 97ac428a7f550..0000000000000 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ /dev/null @@ -1,322 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, fetch -, fetchpatch -, cmake -, python3 -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libpfm -, libxml2 -, ncurses -, version -, release_version -, zlib -, buildLlvmTools -, debugVersion ? false -, doCheck ? stdenv.isLinux && (!stdenv.isx86_32) - && (stdenv.hostPlatform == stdenv.buildPlatform) -, enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic -# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 -# broken for the armv7l builder -, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch -, enablePolly ? false -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with lib; - let parts = splitVersion release_version; in - imap (i: _: concatStringsSep "." (take i parts)) parts; - - # Ordinarily we would just the `doCheck` and `checkDeps` functionality - # `mkDerivation` gives us to manage our test dependencies (instead of breaking - # out `doCheck` as a package level attribute). - # - # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in - # particular the children it uses to do feature detection. - # - # This means that python deps we add to `checkDeps` (which the python - # interpreter is made aware of via `$PYTHONPATH` – populated by the python - # setup hook) are not picked up by `lit` which causes it to skip tests. - # - # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work - # because this package is shadowed in `$PATH` by the regular `python3` - # package. - # - # So, we "manually" assemble one python derivation for the package to depend - # on, taking into account whether checks are enabled or not: - python = if doCheck then - let - checkDeps = ps: with ps; [ psutil ]; - in python3.withPackages checkDeps - else python3; - -in stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v"; - polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h"; - - unpackPhase = '' - unpackFile $src - mv llvm-${version}* llvm - sourceRoot=$PWD/llvm - '' + optionalString enablePolly '' - unpackFile $polly_src - mv polly-* $sourceRoot/tools/polly - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake python ] - ++ optional enableManpages python3.pkgs.sphinx; - - buildInputs = [ libxml2 libffi ] - ++ optional enablePFM libpfm; # exegesis - - propagatedBuildInputs = [ ncurses zlib ]; - - patches = [ - # backport, fix building rust crates with lto - (fetchpatch { - url = "https://github.com/llvm-mirror/llvm/commit/da1fb72bb305d6bc1f3899d541414146934bf80f.patch"; - sha256 = "0p81gkhc1xhcx0hmnkwyhrn8x8l8fd24xgaj1whni29yga466dwc"; - }) - (fetchpatch { - url = "https://github.com/llvm-mirror/llvm/commit/cc1f2a595ead516812a6c50398f0f3480ebe031f.patch"; - sha256 = "0k6k1p5yisgwx417a67s7sr9930rqh1n0zv5jvply8vjjy4b3kf8"; - }) - - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch - - ./gnu-install-dirs.patch - - # Fix invalid std::string(nullptr) for GCC 12 - (fetchpatch { - name = "nvptx-gcc-12.patch"; - url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; - sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; - stripLen = 1; - }) - - ../../llvm-7-musl.patch - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - '' + optionalString stdenv.hostPlatform.isAarch32 '' - # skip failing X86 test cases on armv7l - rm test/DebugInfo/X86/debug_addr.ll - rm test/tools/llvm-dwarfdump/X86/debug_addr.s - rm test/tools/llvm-dwarfdump/X86/debug_addr_address_size_mismatch.s - rm test/tools/llvm-dwarfdump/X86/debug_addr_dwarf4.s - rm test/tools/llvm-dwarfdump/X86/debug_addr_unsupported_version.s - rm test/tools/llvm-dwarfdump/X86/debug_addr_version_mismatch.s - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - # Seems to require certain floating point hardware (NEON?) - rm test/ExecutionEngine/frem.ll - '' + '' - patchShebangs test/BugPoint/compile-custom.ll.py - '' + '' - # Tweak tests to ignore namespace part of type to support - # gcc-12: https://gcc.gnu.org/PR103598. - # The change below mangles strings like: - # CHECK-NEXT: Starting llvm::Function pass manager run. - # to: - # CHECK-NEXT: Starting {{.*}}Function pass manager run. - for f in \ - test/Other/new-pass-manager.ll \ - test/Other/new-pm-defaults.ll \ - test/Other/new-pm-lto-defaults.ll \ - test/Other/new-pm-thinlto-defaults.ll \ - test/Other/pass-pipeline-parsing.ll \ - test/Transforms/Inline/cgscc-incremental-invalidate.ll \ - test/Transforms/Inline/clear-analyses.ll \ - test/Transforms/LoopUnroll/unroll-loop-invalidation.ll \ - test/Transforms/SCCP/preserve-analysis.ll \ - test/Transforms/SROA/dead-inst.ll \ - test/tools/gold/X86/new-pm.ll \ - ; do - echo "PATCH: $f" - substituteInPlace $f \ - --replace 'Starting llvm::' 'Starting {{.*}}' \ - --replace 'Finished llvm::' 'Finished {{.*}}' - done - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" - "-DLLVM_ENABLE_DUMP=ON" - ] ++ optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (enableGoldPlugin) [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals (isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ${lib.concatMapStringsSep "\n" (v: '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib - '') versionSuffixes} - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - inherit doCheck; - - checkTarget = "check-all"; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - buildPhase = '' - make docs-llvm-man - ''; - - propagatedBuildInputs = []; - - installPhase = '' - make -C docs install - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index 0b2d3b79e41f7..0000000000000 --- a/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt -index 9939097f743e..8cc538da912a 100644 ---- a/tools/polly/CMakeLists.txt -+++ b/tools/polly/CMakeLists.txt -@@ -2,7 +2,11 @@ - if (NOT DEFINED LLVM_MAIN_SRC_DIR) - project(Polly) - cmake_minimum_required(VERSION 3.4.3) -+endif() -+ -+include(GNUInstallDirs) - -+if (NOT DEFINED LLVM_MAIN_SRC_DIR) - # Where is LLVM installed? - find_package(LLVM CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -@@ -145,14 +149,14 @@ include_directories( - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE - ) - - install(DIRECTORY ${POLLY_BINARY_DIR}/include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE -diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt -index 969292cd6b00..d7aea77bdd20 100644 ---- a/tools/polly/cmake/CMakeLists.txt -+++ b/tools/polly/cmake/CMakeLists.txt -@@ -79,18 +79,18 @@ file(GENERATE - - # Generate PollyConfig.cmake for the install tree. - unset(POLLY_EXPORTS) --set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -+set(POLLY_INSTALL_PREFIX "") - set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") -+set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") -+set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - if (POLLY_BUNDLED_ISL) - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -- "${POLLY_INSTALL_PREFIX}/include/polly" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" - ) - else() - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" - ${ISL_INCLUDE_DIRS} - ) - endif() -@@ -100,12 +100,12 @@ endif() - foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) - get_target_property(tgt_type ${tgt} TYPE) - if (tgt_type STREQUAL "EXECUTABLE") -- set(tgt_prefix "bin/") -+ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") - else() -- set(tgt_prefix "lib/") -+ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") - endif() - -- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") -+ set(tgt_path "${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") - file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) - - if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index e48203871884..5bc8a2a52541 100644 ---- a/tools/polly/cmake/polly_macros.cmake -+++ b/tools/polly/cmake/polly_macros.cmake -@@ -44,8 +44,8 @@ macro(add_polly_library name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") - install(TARGETS ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) -diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt -index 8ffd984e542b..261cc19f3238 100644 ---- a/tools/polly/lib/External/CMakeLists.txt -+++ b/tools/polly/lib/External/CMakeLists.txt -@@ -274,7 +274,7 @@ if (POLLY_BUNDLED_ISL) - install(DIRECTORY - ${ISL_SOURCE_DIR}/include/ - ${ISL_BINARY_DIR}/include/ -- DESTINATION include/polly -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE diff --git a/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch deleted file mode 100644 index 7e7921e49ab0a..0000000000000 --- a/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch +++ /dev/null @@ -1,386 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3d3013cedcd..b298d6ef04af 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -275,15 +275,21 @@ if (CMAKE_BUILD_TYPE AND - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - endif() - -+include(GNUInstallDirs) -+ - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - --set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") -+set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -+ "Path for binary subdirectory (defaults to 'bin')") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - - set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING - "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") - mark_as_advanced(LLVM_UTILS_INSTALL_DIR) - -+set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING -+ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) -+ - # They are used as destination of target generators. - set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) - set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -@@ -531,9 +537,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) - option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) - option (LLVM_ENABLE_BINDINGS "Build bindings." ON) - --set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" -+set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" - CACHE STRING "Doxygen-generated HTML documentation install directory") --set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" -+set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" - CACHE STRING "OCamldoc-generated HTML documentation install directory") - - option (LLVM_BUILD_EXTERNAL_COMPILER_RT -@@ -966,7 +972,7 @@ endif() - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -978,7 +984,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index c0f90ba7068d..d656156ff9c8 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -638,11 +638,11 @@ macro(add_llvm_library name) - else() - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR - (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) -- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(ARG_SHARED OR BUILD_SHARED_LIBS) - if(WIN32 OR CYGWIN OR MINGW) - set(install_type RUNTIME) -- set(install_dir bin) -+ set(install_dir ${CMAKE_INSTALL_BINDIR}) - else() - set(install_type LIBRARY) - endif() -@@ -684,9 +684,9 @@ macro(add_llvm_loadable_module name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - if(WIN32 OR CYGWIN) - # DLL platform -- set(dlldir "bin") -+ set(dlldir "${CMAKE_INSTALL_BINDIR}") - else() -- set(dlldir "lib${LLVM_LIBDIR_SUFFIX}") -+ set(dlldir "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - - if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR -@@ -698,7 +698,7 @@ macro(add_llvm_loadable_module name) - install(TARGETS ${name} - ${export_to_llvmexports} - LIBRARY DESTINATION ${dlldir} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endif() -@@ -912,7 +912,7 @@ macro(add_llvm_example name) - endif() - add_llvm_executable(${name} ${ARGN}) - if( LLVM_BUILD_EXAMPLES ) -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endmacro(add_llvm_example name) -@@ -1430,7 +1430,7 @@ function(llvm_install_library_symlink name dest type) - set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) - set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) - -- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(WIN32 AND "${type}" STREQUAL "SHARED") - set(output_dir bin) - endif() -@@ -1446,7 +1446,7 @@ function(llvm_install_library_symlink name dest type) - endif() - endfunction() - --function(llvm_install_symlink name dest) -+function(llvm_install_symlink name dest output_dir) - cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) - foreach(path ${CMAKE_MODULE_PATH}) - if(EXISTS ${path}/LLVMInstallSymlink.cmake) -@@ -1469,7 +1469,7 @@ function(llvm_install_symlink name dest) - set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) - - install(SCRIPT ${INSTALL_SYMLINK} -- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" -+ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" - COMPONENT ${component}) - - if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) -@@ -1551,7 +1551,8 @@ function(add_llvm_tool_symlink link_name target) - endif() - - if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) -- llvm_install_symlink(${link_name} ${target}) -+ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) -+ llvm_install_symlink(${link_name} ${target} ${output_dir}) - endif() - endif() - endfunction() -@@ -1635,9 +1636,9 @@ function(llvm_setup_rpath name) - - if (APPLE) - set(_install_name_dir INSTALL_NAME_DIR "@rpath") -- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) -+ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) - elseif(UNIX) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) - if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-z,origin ") -diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 02bab6846376..eff26adb2efc 100644 ---- a/cmake/modules/AddOCaml.cmake -+++ b/cmake/modules/AddOCaml.cmake -@@ -140,9 +140,9 @@ function(add_ocaml_library name) - endforeach() - - if( APPLE ) -- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - elseif( UNIX ) -- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") - -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index 22e3dcb776aa..ba77b9c195e2 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) - - elseif (builder STREQUAL html) - string(TOUPPER "${project}" project_upper) -- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" -+ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" - CACHE STRING "HTML documentation install directory for ${project}") - - # '/.' indicates: copy the contents of the directory directly into -diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index 6c316a2f04fb..129c0995059c 100644 ---- a/cmake/modules/CMakeLists.txt -+++ b/cmake/modules/CMakeLists.txt -@@ -1,4 +1,4 @@ --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - # First for users who use an installed LLVM, create the LLVMExports.cmake file. -@@ -90,11 +90,11 @@ foreach(p ${_count}) - set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} - get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") - endforeach(p) --set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") --set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") -+set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") -+set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") - set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") --set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") -+set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") - set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") - set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") - configure_file( -diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake -index 1a04de931ff7..1c5ea4200635 100644 ---- a/cmake/modules/LLVMInstallSymlink.cmake -+++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -10,7 +10,7 @@ function(install_symlink name target outdir) - set(LINK_OR_COPY copy) - endif() - -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") -+ set(bindir "${DESTDIR}${outdir}/") - - message("Creating ${name}") - -diff --git a/docs/CMake.rst b/docs/CMake.rst -index cbcadc212498..a3da96546f43 100644 ---- a/docs/CMake.rst -+++ b/docs/CMake.rst -@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. - **LLVM_LIBDIR_SUFFIX**:STRING - Extra suffix to append to the directory where libraries are to be - installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` -- to install libraries to ``/usr/lib64``. -+ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. - - **CMAKE_C_FLAGS**:STRING - Extra flags to use when compiling C source files. -@@ -473,8 +473,8 @@ LLVM-specific variables - - **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING - The path to install Doxygen-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/doxygen-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. - - **LLVM_ENABLE_SPHINX**:BOOL - If specified, CMake will search for the ``sphinx-build`` executable and will make -@@ -505,13 +505,33 @@ LLVM-specific variables - - **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING - The path to install Sphinx-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. - - **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING - The path to install OCamldoc-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/ocaml-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. -+ -+**CMAKE_INSTALL_BINDIR**:STRING -+ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `bin`. -+ -+**CMAKE_INSTALL_LIBDIR**:STRING -+ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `lib`. -+ -+**CMAKE_INSTALL_INCLUDEDIR**:STRING -+ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `include`. -+ -+**CMAKE_INSTALL_DOCDIR**:STRING -+ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/doc`. -+ -+**CMAKE_INSTALL_MANDIR**:STRING -+ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/man`. - - **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL - OS X Only: If enabled CMake will generate a target named -@@ -676,9 +696,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). - - This file is available in two different locations. - --* ``<INSTALL_PREFIX>/lib/cmake/llvm/LLVMConfig.cmake`` where -- ``<INSTALL_PREFIX>`` is the install prefix of an installed version of LLVM. -- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. -+* ``<LLVM_INSTALL_PACKAGE_DIR>LLVMConfig.cmake`` where -+ ``<LLVM_INSTALL_PACKAGE_DIR>`` is the location where LLVM CMake modules are -+ installed as part of an installed version of LLVM. This is typically -+ ``cmake/llvm/`` within the lib directory. On Linux, this is typically -+ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. - - * ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where - ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only -diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt -index 1d5ca3ba92b0..026f5453c1da 100644 ---- a/include/llvm/CMakeLists.txt -+++ b/include/llvm/CMakeLists.txt -@@ -4,5 +4,5 @@ add_subdirectory(Support) - # If we're doing an out-of-tree build, copy a module map for generated - # header files into the build area. - if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -- configure_file(module.modulemap.build module.modulemap COPYONLY) -+ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) - endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index f201e1f7bff0..4582ed556a02 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -24,6 +24,10 @@ - #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" -+#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" -+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" -+#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" -+#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" - #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 892adc3b9dd8..cabe7fcc630f 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -333,12 +333,26 @@ int main(int argc, char **argv) { - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - } else { - ActivePrefix = CurrentExecPrefix; -- ActiveIncludeDir = ActivePrefix + "/include"; -- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); -- sys::fs::make_absolute(ActivePrefix, path); -- ActiveBinDir = path.str(); -- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; -- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveIncludeDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveBinDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveLibDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveCMakeDir = std::string(path.str()); -+ } - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt -index 6e913519a809..85641eef721f 100644 ---- a/tools/lto/CMakeLists.txt -+++ b/tools/lto/CMakeLists.txt -@@ -19,7 +19,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) - add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT LTO) - - if (APPLE) -diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt -index 19b606933082..27b9f71b3d79 100644 ---- a/tools/opt-viewer/CMakeLists.txt -+++ b/tools/opt-viewer/CMakeLists.txt -@@ -8,6 +8,6 @@ set (files - - foreach (file ${files}) - install(PROGRAMS ${file} -- DESTINATION share/opt-viewer -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer - COMPONENT opt-viewer) - endforeach (file) diff --git a/pkgs/development/compilers/llvm/7/openmp/default.nix b/pkgs/development/compilers/llvm/7/openmp/default.nix deleted file mode 100644 index a87dd319d8ec3..0000000000000 --- a/pkgs/development/compilers/llvm/7/openmp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, llvm_meta -, fetch -, cmake -, llvm -, targetLlvm -, perl -, version -}: - -stdenv.mkDerivation { - pname = "openmp"; - inherit version; - - src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy"; - - nativeBuildInputs = [ cmake perl ]; - buildInputs = [ - (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) - ]; - - meta = llvm_meta // { - homepage = "https://openmp.llvm.org/"; - description = "Support for the OpenMP language"; - longDescription = '' - The OpenMP subproject of LLVM contains the components required to build an - executable OpenMP program that are outside the compiler itself. - Contains the code for the runtime library against which code compiled by - "clang -fopenmp" must be linked before it can run and the library that - supports offload to target devices. - ''; - # "All of the code is dual licensed under the MIT license and the UIUC - # License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 8a0fea85e260d..7cef04347429c 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -117,7 +117,17 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + # Add missing isl header includess required to build LLVM 8 + Polly with clang 16. + (fetchpatch { + name = "polly-ppcg-isl-headers.patch"; + url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; + hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; + extraPrefix = "tools/polly/lib/External/ppcg/"; + stripLen = 1; + }) + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index 526030d6b34d8..75c7868559734 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -115,7 +115,17 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + # Add missing isl header includess required to build LLVM 9 + Polly with clang 16. + (fetchpatch { + name = "polly-ppcg-isl-headers.patch"; + url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; + hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; + extraPrefix = "tools/polly/lib/External/ppcg/"; + stripLen = 1; + }) + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 951678847076b..c82a88bb2793e 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { pname = "polyml"; version = "5.9.1"; + src = fetchFromGitHub { + owner = "polyml"; + repo = "polyml"; + rev = "v${version}"; + sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; + }; + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; @@ -24,12 +31,13 @@ stdenv.mkDerivation rec { "--with-gmp" ]; - src = fetchFromGitHub { - owner = "polyml"; - repo = "polyml"; - rev = "v${version}"; - sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; - }; + doCheck = true; + + checkPhase = '' + runHook preCheck + make check + runHook postCheck + ''; meta = with lib; { description = "Standard ML compiler and interpreter"; diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index 2d6a48631c054..941ac1bcb2c34 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -6,7 +6,7 @@ , boehmgc , openssl , zlib -, odbcSupport ? true +, odbcSupport ? !stdenv.isDarwin , libiodbc }: @@ -31,8 +31,10 @@ stdenv.mkDerivation rec { buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=int-conversion"; + meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && stdenv.isAarch64; description = "An R6RS/R7RS Scheme system"; longDescription = '' Sagittarius Scheme is a free Scheme implementation supporting diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index e72cc3cdb93a2..da6b2dc16700d 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-WG0vU3lxX5FNs0l37mTE1T7rSEEtfTEisE3cMphzeAk="; + sha256 = "sha256-ePBEiT7Yl54KQou/VP/aZEJ6BueH8ocB+/TUhZJkgH8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 6d086d57b017f..833c0db468a79 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -3,6 +3,7 @@ , abc-verifier , bash , bison +, boost , fetchFromGitHub , flex , libffi @@ -18,6 +19,7 @@ , yosys-bluespec , yosys-ghdl , yosys-symbiflow +, enablePython ? true # enable python binding }: # NOTE: as of late 2020, yosys has switched to an automation robot that @@ -68,6 +70,10 @@ let ghdl = yosys-ghdl; } // (yosys-symbiflow); + boost_python = boost.override { + enablePython = true; + python = python3; + }; in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; @@ -90,7 +96,7 @@ in stdenv.mkDerivation (finalAttrs: { (python3.withPackages (pp: with pp; [ click ])) - ]; + ] ++ lib.optional enablePython boost_python; makeFlags = [ "PREFIX=${placeholder "out"}"]; @@ -123,6 +129,10 @@ in stdenv.mkDerivation (finalAttrs: { echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing." exit 1 fi + '' + lib.optionalString enablePython '' + echo "ENABLE_PYOSYS := 1" >> Makefile.conf + echo "PYTHON_DESTDIR := $out/${python3.sitePackages}" >> Makefile.conf + echo "BOOST_PYTHON_LIB := -lboost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" >> Makefile.conf ''; checkTarget = "test"; diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 16a26d9fa32eb..ebc03a3a7306f 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,18 +1,18 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.16"; out = "1.1.0"; } - { case = range "8.7" "8.15"; out = "1.0.0"; } + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.10" "8.16") (isLt "2.0") ]; out = "1.1.0"; } + { cases = [ (range "8.7" "8.15") (isLt "2.0") ]; out = "1.0.0"; } ] null; release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - propagatedBuildInputs = [ mathcomp-algebra ]; + propagatedBuildInputs = [ mathcomp.algebra ]; meta = with lib; { description = "A formalization of bitset operations in Coq"; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index bce21f0e6c62d..15dd62fb75521 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -10,7 +10,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.17" "8.18") (isGe "2.0.0") ]; out = "0.4.0"; } - { cases = [(range "8.11" "8.18") (isGe "1.12.0") ]; out = "0.3.1"; } + { cases = [(range "8.11" "8.18") (range "1.12.0" "1.18.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } ] null; diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index 1e16adddf4958..7152084854b63 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -12,8 +12,8 @@ mkCoqDerivation rec { inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp.version] [ - { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "0.9"; } - { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; } + { cases = [ (range "8.13" "8.16") (range "1.12.0" "1.18.0") ]; out = "0.9"; } + { cases = [ (range "8.13" "8.14") (range "1.12.0" "1.18.0") ]; out = "0.5"; } ] null; propagatedBuildInputs = [ diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index 493381842109c..c64380bec23d4 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "elf2uf2-rs"; - version = "1.3.7"; + version = "1.3.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2ZilZIYXCNrKJlkHBsz/2/pMtF+UDfjDlt53ylcwgus="; + sha256 = "sha256-wR2rxovUYBW9kKMFJG5lsRhtpI12L+HZe73kQyckEdI="; }; nativeBuildInputs = [ @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { Foundation ]; - cargoSha256 = "sha256-+3Rqlzkrw9XfM3PelGNbnRGaWQLbzVJ7iJgvGgVt5FE="; + cargoHash = "sha256-gSEmNmVpREvD3lDJmcmPnN9keu7SaAIcO7fDhOBhu/E="; meta = with lib; { description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; diff --git a/pkgs/development/embedded/openocd-rp2040/default.nix b/pkgs/development/embedded/openocd-rp2040/default.nix deleted file mode 100644 index 688d83ac27e80..0000000000000 --- a/pkgs/development/embedded/openocd-rp2040/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenv -, fetchgit -, pkg-config -, hidapi -, libftdi1 -, libusb1 -, which -, libtool -, autoconf -, automake -, texinfo -, git -, libgpiod_1 -}: - -stdenv.mkDerivation { - pname = "openocd-rp2040"; - version = "0.12.0"; - src = fetchgit { - url = "https://github.com/raspberrypi/openocd"; - rev = "4d87f6dcae77d3cbcd8ac3f7dc887adf46ffa504"; - sha256 = "sha256-SYC0qqNx09yO/qeKDDN8dF/9d/dofJ5B1h/PofhG8Jw="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - hidapi - libftdi1 - libusb1 - which - libtool - autoconf - automake - texinfo - git - ] - ++ - # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/ - lib.optional stdenv.isLinux libgpiod_1; - - configurePhase = '' - SKIP_SUBMODULE=1 ./bootstrap - ./configure --prefix=$out - ''; - - enableParallelBuilding = true; - - postInstall = lib.optionalString stdenv.isLinux '' - mkdir -p "$out/etc/udev/rules.d" - rules="$out/share/openocd/contrib/60-openocd.rules" - if [ ! -f "$rules" ]; then - echo "$rules is missing, must update the Nix file." - exit 1 - fi - ln -s "$rules" "$out/etc/udev/rules.d/" - ''; - - meta = with lib; { - description = "OpenOCD fork for rp2040 microcontroller"; - longDescription = '' - This is a fork of OpenOCD by Raspberry Pi, - which brings support to the rp2040 microcontroller. - ''; - homepage = "https://github.com/raspberrypi/openocd"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lu15w1r7h ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/hare-packages/hare-json/default.nix b/pkgs/development/hare-packages/hare-json/default.nix new file mode 100644 index 0000000000000..d9afdeadf7f01 --- /dev/null +++ b/pkgs/development/hare-packages/hare-json/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, hare, harec, fetchFromSourcehut }: + +stdenv.mkDerivation (finalAttrs: { + pname = "hare-json"; + version = "unstable-2023-09-21"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hare-json"; + rev = "e24e5dceb8628ff569338e6c4fdba35a5017c5e2"; + hash = "sha256-7QRieokqXarKwLfZynS8Rum9JV9hcxod00BWAUwwliM="; + }; + + nativeBuildInputs = [ hare ]; + + configurePhase = '' + runHook preConfigure + + export HARECACHE="$NIX_BUILD_TOP/.harecache" + export BINOUT="$NIX_BUILD_TOP/.bin" + + makeFlagsArray+=( + PREFIX="${builtins.placeholder "out"}" + ) + + runHook postConfigure + ''; + + doCheck = true; + + meta = with lib; { + homepage = "https://git.sr.ht/~sircmpwn/hare-json/"; + description = "This package provides JSON support for Hare"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ starzation ]; + + inherit (harec.meta) platforms badPlatforms; + }; +}) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7fe56b3f13d01..c0f0f0526cbf2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -121,22 +121,24 @@ self: super: { # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex); - hiedb = - lib.pipe - super.hiedb - [ - # hiedb-0.4.3.0 does not yet support algebraic-graphs-0.7. This patch works - # around the issue. - # https://github.com/wz1000/HieDb/pull/44 - (appendPatch - (pkgs.fetchpatch { - name = "hiedb-algebraic-graphs-0.7.patch"; - url = "https://github.com/wz1000/HieDB/commit/4ac8e6735321872b9d5d15a9cac492add5555234.patch"; - hash = "sha256-Iu+M8r+DrpoxUCG6yekgbW+GffoNjjRksnwUJ6jojhE="; - })) - # Patch does not actually bump the bound in the .cabal file. - doJailbreak - ]; + # 2023-12-03: https://github.com/haskell/haskell-language-server/pull/3867 + hls-plugin-api = appendPatch (fetchpatch { + url = "https://github.com/haskell/haskell-language-server/commit/1c884ea856cceeaa3254a2ef68c8ab3a3c353153.patch"; + relative = "hls-plugin-api"; + hash = "sha256-vlXPdEvmuIl+cM+u/GdHi8r72r4+Tqtsvx0CGbWEFCQ="; + }) (doJailbreak super.hls-plugin-api); + ghcide = appendPatch (fetchpatch { + url = "https://github.com/haskell/haskell-language-server/commit/1c884ea856cceeaa3254a2ef68c8ab3a3c353153.patch"; + relative = "ghcide"; + hash = "sha256-1URXyQf88v3hjFGvNmcIjHxJ5vExH3iI92XktDrQs0U="; + }) (doJailbreak super.ghcide); + hls-test-utils = doJailbreak super.hls-test-utils; + hls-alternate-number-format-plugin = doJailbreak super.hls-alternate-number-format-plugin; + hls-cabal-plugin = doJailbreak super.hls-cabal-plugin; + hls-call-hierarchy-plugin = doJailbreak super.hls-call-hierarchy-plugin; + hls-explicit-fixity-plugin = doJailbreak super.hls-explicit-fixity-plugin; + hls-floskell-plugin = doJailbreak super.hls-floskell-plugin; + hls-gadt-plugin = doJailbreak super.hls-gadt-plugin; ########################################### ### END HASKELL-LANGUAGE-SERVER SECTION ### @@ -484,7 +486,6 @@ self: super: { # Too strict bounds on algebraic-graphs and bytestring # https://github.com/haskell-nix/hnix-store/issues/180 hnix-store-core = doJailbreak super.hnix-store-core; - hnix-store-core_0_6_1_0 = doDistribute (doJailbreak super.hnix-store-core_0_6_1_0); # Fails for non-obvious reasons while attempting to use doctest. focuslist = dontCheck super.focuslist; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix deleted file mode 100644 index acde3041b1fa1..0000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -let - inherit (pkgs.stdenv.hostPlatform) isDarwin; -in - -self: super: { - - llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - - # Disable GHC 8.8.x core libraries. - array = null; - base = null; - binary = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-compact = null; - ghc-heap = null; - ghc-prim = null; - ghci = null; - haskeline = null; - hpc = null; - integer-gmp = null; - libiserv = null; - mtl = null; - parsec = null; - pretty = null; - process = null; - rts = null; - stm = null; - template-haskell = null; - # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; - text = null; - time = null; - transformers = null; - unix = null; - # GHC only bundles the xhtml library if haddock is enabled, check if this is - # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0; - # These core package only exist for GHC >= 9.4. The best we can do is feign - # their existence to callPackages, but their is no shim for lower GHC versions. - system-cxx-std-lib = null; - - # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work - Cabal-syntax = self.Cabal-syntax_3_6_0_0; - - # GHC 8.8.x can build haddock version 2.23.* - haddock = self.haddock_2_23_1; - haddock-api = self.haddock-api_2_23_1; - - # This build needs a newer version of Cabal. - cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; }; - - # Additionally depends on OneTuple for GHC < 9.0 - base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries; - - # For GHC < 9.4, some packages need data-array-byte as an extra dependency - primitive = addBuildDepends [ self.data-array-byte ] super.primitive; - hashable = addBuildDepends [ - self.data-array-byte - self.base-orphans - ] super.hashable; - - # Ignore overly restrictive upper version bounds. - aeson-diff = doJailbreak super.aeson-diff; - async = doJailbreak super.async; - ChasingBottoms = doJailbreak super.ChasingBottoms; - chell = doJailbreak super.chell; - Diff = dontCheck super.Diff; - doctest = doJailbreak super.doctest; - hashable-time = doJailbreak super.hashable-time; - hledger-lib = doJailbreak super.hledger-lib; # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3 - integer-logarithms = doJailbreak super.integer-logarithms; - lucid = doJailbreak super.lucid; - parallel = doJailbreak super.parallel; - setlocale = doJailbreak super.setlocale; - split = doJailbreak super.split; - system-fileio = doJailbreak super.system-fileio; - tasty-expected-failure = doJailbreak super.tasty-expected-failure; - tasty-hedgehog = doJailbreak super.tasty-hedgehog; - test-framework = doJailbreak super.test-framework; - th-expand-syns = doJailbreak super.th-expand-syns; - # TODO: remove when upstream accepts https://github.com/snapframework/io-streams-haproxy/pull/17 - io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13 - snap-server = doJailbreak super.snap-server; - exact-pi = doJailbreak super.exact-pi; - time-compat = doJailbreak super.time-compat; - http-media = unmarkBroken (doJailbreak super.http-media); - servant-server = unmarkBroken (doJailbreak super.servant-server); - basement = doDistribute self.basement_0_0_14; - foundation = doDistribute (dontCheck self.foundation_0_0_28); - vault = dontHaddock super.vault; - - # https://github.com/snapframework/snap-core/issues/288 - snap-core = overrideCabal (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; }) super.snap-core; - - # Upstream ships a broken Setup.hs file. - csv = overrideCabal (drv: { prePatch = "rm Setup.hs"; }) super.csv; - - # https://github.com/kowainik/relude/issues/241 - relude = dontCheck super.relude; - - # The current version 2.14.2 does not compile with ghc-8.8.x or newer because - # of issues with Cabal 3.x. - darcs = dontDistribute super.darcs; - - # liquidhaskell does not support ghc version 8.8.x. - liquid = markBroken super.liquid; - liquid-base = markBroken super.liquid-base; - liquid-bytestring = markBroken super.liquid-bytestring; - liquid-containers = markBroken super.liquid-containers; - liquid-ghc-prim = markBroken super.liquid-ghc-prim; - liquid-parallel = markBroken super.liquid-parallel; - liquid-platform = markBroken super.liquid-platform; - liquid-prelude = markBroken super.liquid-prelude; - liquid-vector = markBroken super.liquid-vector; - liquidhaskell = markBroken super.liquidhaskell; - - # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. - exceptions = super.exceptions_0_10_7; - - ormolu = super.ormolu_0_2_0_0; - - ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6); - - mime-string = disableOptimization super.mime-string; - - haskell-language-server = throw "haskell-language-server dropped support for ghc 8.8 in version 1.9.0.0 please use a newer ghc version or an older nixpkgs version"; - - hlint = self.hlint_3_2_8; - - ghc-lib-parser = doDistribute self.ghc-lib-parser_8_10_7_20220219; - ghc-lib = doDistribute self.ghc-lib_8_10_7_20220219; - - # ghc versions which don’t match the ghc-lib-parser-ex version need the - # additional dependency to compile successfully. - ghc-lib-parser-ex = doDistribute (addBuildDepend self.ghc-lib-parser self.ghc-lib-parser-ex_8_10_0_24); - - # has a restrictive lower bound on Cabal - fourmolu = doJailbreak super.fourmolu; - - # Overly-strict bounds introducted by a revision in version 0.3.2. - text-metrics = doJailbreak super.text-metrics; - - # OneTuple needs hashable (instead of ghc-prim) and foldable1-classes-compat for GHC < 9 - OneTuple = addBuildDepends [ - self.foldable1-classes-compat - ] (super.OneTuple.override { - ghc-prim = self.hashable; - }); - - # Temporarily disabled blaze-textual for GHC >= 9.0 causing hackage2nix ignoring it - # https://github.com/paul-rouse/mysql-simple/blob/872604f87044ff6d1a240d9819a16c2bdf4ed8f5/Database/MySQL/Internal/Blaze.hs#L4-L10 - mysql-simple = addBuildDepends [ - self.blaze-textual - ] super.mysql-simple; - - # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0) - inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp; - - # Depends on OneTuple for GHC < 9.0 - universe-base = addBuildDepends [ self.OneTuple ] super.universe-base; - - # doctest-parallel dependency requires newer Cabal - regex-tdfa = dontCheck super.regex-tdfa; - - # Unnecessarily strict lower bound on base - # https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823 - megaparsec = doJailbreak super.megaparsec; - - # Needs OneTuple for ghc < 9.2 - binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; - - # Later versions only support GHC >= 9.2 - ghc-exactprint = self.ghc-exactprint_0_6_4; - apply-refact = self.apply-refact_0_9_3_0; - - # Requires GHC < 9.4 - ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); -} diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 839b3c1bee5bf..290b3f6bc736d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1672,6 +1672,7 @@ broken-packages: - fortran-vars # failure in job https://hydra.nixos.org/build/233257719 at 2023-09-02 - fortytwo # failure in job https://hydra.nixos.org/build/233209552 at 2023-09-02 - foscam-filename # failure in job https://hydra.nixos.org/build/233237326 at 2023-09-02 + - fp-ieee # failure in job https://hydra.nixos.org/build/241516602 at 2023-12-03 - FPretty # failure in job https://hydra.nixos.org/build/233196648 at 2023-09-02 - fptest # failure in job https://hydra.nixos.org/build/233233288 at 2023-09-02 - fquery # failure in job https://hydra.nixos.org/build/233196287 at 2023-09-02 @@ -3393,6 +3394,7 @@ broken-packages: - MapWith # failure in job https://hydra.nixos.org/build/233237146 at 2023-09-02 - markdown-kate # failure in job https://hydra.nixos.org/build/233227051 at 2023-09-02 - marked-pretty # failure in job https://hydra.nixos.org/build/233193892 at 2023-09-02 + - markov-chain-usage-model # failure in job https://hydra.nixos.org/build/241522329 at 2023-12-03 - markov-realization # failure in job https://hydra.nixos.org/build/233234901 at 2023-09-02 - mars # failure in job https://hydra.nixos.org/build/234449730 at 2023-09-13 - marshal-contt # failure in job https://hydra.nixos.org/build/233231755 at 2023-09-02 @@ -4858,6 +4860,7 @@ broken-packages: - semilattices # failure in job https://hydra.nixos.org/build/233223765 at 2023-09-02 - sendgrid-haskell # failure in job https://hydra.nixos.org/build/233228693 at 2023-09-02 - sendgrid-v3 # failure in job https://hydra.nixos.org/build/233224134 at 2023-09-02 + - sensei # failure in job https://hydra.nixos.org/build/241518007 at 2023-12-03 - sensu-run # failure in job https://hydra.nixos.org/build/233251719 at 2023-09-02 - sentry # failure in job https://hydra.nixos.org/build/233246813 at 2023-09-02 - seonbi # failure in job https://hydra.nixos.org/build/233196115 at 2023-09-02 @@ -4924,6 +4927,7 @@ broken-packages: - SessionLogger # failure in job https://hydra.nixos.org/build/233235790 at 2023-09-02 - sessions # failure in job https://hydra.nixos.org/build/233214614 at 2023-09-02 - sessiontypes # failure in job https://hydra.nixos.org/build/233224975 at 2023-09-02 + - setdown # failure in job https://hydra.nixos.org/build/241521053 at 2023-12-03 - setgame # failure in job https://hydra.nixos.org/build/233218664 at 2023-09-02 - set-of # failure in job https://hydra.nixos.org/build/233202960 at 2023-09-02 - setoid # failure in job https://hydra.nixos.org/build/233213744 at 2023-09-02 @@ -5529,6 +5533,7 @@ broken-packages: - th-traced # failure in job https://hydra.nixos.org/build/233247762 at 2023-09-02 - thumbnail # failure in job https://hydra.nixos.org/build/233257110 at 2023-09-02 - thumbnail-plus # failure in job https://hydra.nixos.org/build/233255464 at 2023-09-02 + - thyme # failure in job https://hydra.nixos.org/build/241518029 at 2023-12-03 - tianbar # failure in job https://hydra.nixos.org/build/233195811 at 2023-09-02 - ticket-management # failure in job https://hydra.nixos.org/build/233247134 at 2023-09-02 - tictactoe3d # failure in job https://hydra.nixos.org/build/233193080 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index c93590d0980c5..c22e2f2c31ca1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 21.19 +# Stackage LTS 21.21 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -57,7 +57,7 @@ default-package-overrides: - annotated-exception ==0.2.0.5 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.11.5 - - ansi-terminal-game ==1.9.1.3 + - ansi-terminal-game ==1.9.2.0 - ansi-terminal-types ==0.11.5 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 @@ -121,7 +121,7 @@ default-package-overrides: - autodocodec-openapi3 ==0.2.1.1 - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 - - autoexporter ==2.0.0.8 + - autoexporter ==2.0.0.9 - auto-update ==0.1.6 - avro ==0.6.1.2 - aws ==0.24.1 @@ -249,7 +249,7 @@ default-package-overrides: - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.0.1 - bugzilla-redhat ==1.0.1.1 - - burrito ==2.0.1.6 + - burrito ==2.0.1.7 - bv ==0.5 - byteable ==0.1.1 - bytebuild ==0.3.14.0 @@ -263,7 +263,7 @@ default-package-overrides: - byteslice ==0.2.11.1 - bytesmith ==0.3.10.0 - bytestring-builder ==0.10.8.2.0 - - bytestring-lexing ==0.5.0.10 + - bytestring-lexing ==0.5.0.11 - bytestring-mmap ==0.2.2 - bytestring-strict-builder ==0.4.5.7 - bytestring-to-vector ==0.3.0.1 @@ -279,7 +279,7 @@ default-package-overrides: - cabal-doctest ==1.0.9 - cabal-file ==0.1.1 - cabal-install-solver ==3.8.1.0 - - cabal-rpm ==2.1.3 + - cabal-rpm ==2.1.4 - cache ==0.1.3.0 - cached-json-file ==0.1.1 - cacophony ==0.10.1 @@ -304,8 +304,8 @@ default-package-overrides: - cassava-conduit ==0.6.5 - cassava-megaparsec ==2.0.4 - cast ==0.1.0.2 - - cborg ==0.2.9.0 - - cborg-json ==0.2.5.0 + - cborg ==0.2.10.0 + - cborg-json ==0.2.6.0 - cdar-mBound ==0.1.0.4 - c-enum ==0.1.1.3 - cereal ==0.5.8.3 @@ -352,7 +352,7 @@ default-package-overrides: - codec-beam ==0.2.0 - code-conjure ==0.5.2 - code-page ==0.2.1 - - coinor-clp ==0.0 + - coinor-clp ==0.0.0.1 - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.5.0 - co-log-concurrent ==0.5.1.0 @@ -407,7 +407,7 @@ default-package-overrides: - conferer-aeson ==1.1.0.2 - conferer-warp ==1.1.0.1 - ConfigFile ==1.1.4 - - config-ini ==0.2.6.0 + - config-ini ==0.2.7.0 - configuration-tools ==0.6.1 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 @@ -552,7 +552,7 @@ default-package-overrides: - dependent-map ==0.4.0.0 - dependent-sum ==0.7.2.0 - depq ==0.4.2 - - deque ==0.4.4 + - deque ==0.4.4.1 - deriveJsonNoPrefix ==0.1.0.1 - derive-storable ==0.3.1.0 - derive-topdown ==0.0.3.0 @@ -570,7 +570,7 @@ default-package-overrides: - diagrams-cairo ==1.4.2.1 - diagrams-canvas ==1.4.1.2 - diagrams-contrib ==1.4.5.1 - - diagrams-core ==1.5.1 + - diagrams-core ==1.5.1.1 - diagrams-html5 ==1.4.2 - diagrams-lib ==1.4.6 - diagrams-postscript ==1.5.1.1 @@ -682,7 +682,7 @@ default-package-overrides: - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.10 - - enummapset ==0.7.1.0 + - enummapset ==0.7.2.0 - enumset ==0.1 - enum-subset-generate ==0.1.0.1 - enum-text ==0.5.3.0 @@ -775,7 +775,7 @@ default-package-overrides: - fitspec ==0.4.10 - fixed ==0.3 - fixed-length ==0.2.3.1 - - fixed-vector ==1.2.2.1 + - fixed-vector ==1.2.3.0 - fixed-vector-hetero ==0.6.1.1 - fix-whitespace ==0.0.11 - flac ==0.2.1 @@ -786,7 +786,7 @@ default-package-overrides: - flay ==0.4 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==2.0.0.3 + - flow ==2.0.0.4 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.3.0 @@ -826,7 +826,7 @@ default-package-overrides: - functor-classes-compat ==2.0.0.2 - functor-combinators ==0.4.1.2 - fused-effects ==1.1.2.2 - - fusion-plugin ==0.2.6 + - fusion-plugin ==0.2.7 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.1 @@ -895,8 +895,8 @@ default-package-overrides: - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghcjs-perch ==0.3.3.3 - - ghc-lib ==9.4.7.20230826 - - ghc-lib-parser ==9.4.7.20230826 + - ghc-lib ==9.4.8.20231111 + - ghc-lib-parser ==9.4.8.20231111 - ghc-lib-parser-ex ==9.4.0.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.12 @@ -904,7 +904,7 @@ default-package-overrides: - ghc-tcplugins-extra ==0.4.5 - ghc-trace-events ==0.1.2.7 - ghc-typelits-extra ==0.4.6 - - ghc-typelits-knownnat ==0.7.9 + - ghc-typelits-knownnat ==0.7.10 - ghc-typelits-natnormalise ==0.7.9 - ghc-typelits-presburger ==0.7.2.0 - ghost-buster ==0.1.1.0 @@ -932,7 +932,7 @@ default-package-overrides: - gi-soup ==2.4.28 - githash ==0.1.7.0 - github ==0.28.0.1 - - github-release ==2.0.0.8 + - github-release ==2.0.0.9 - github-rest ==1.1.4 - github-types ==0.2.1 - github-webhooks ==0.17.0 @@ -1016,12 +1016,12 @@ default-package-overrides: - haskell-src-exts ==1.23.1 - haskell-src-exts-simple ==1.23.0.0 - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.12 + - haskell-src-meta ==0.8.13 - haskoin-core ==0.21.2 - haskoin-node ==0.18.1 - haskoin-store-data ==0.65.5 - hasktags ==0.72.0 - - hasql ==1.6.3.3 + - hasql ==1.6.3.4 - hasql-dynamic-statements ==0.3.1.2 - hasql-implicits ==0.1.1 - hasql-interpolate ==0.1.0.4 @@ -1070,7 +1070,7 @@ default-package-overrides: - hfsevents ==0.1.6 - hgal ==2.0.0.3 - hidapi ==0.1.8 - - hi-file-parser ==0.1.5.0 + - hi-file-parser ==0.1.6.0 - highlighting-kate ==0.6.4 - hindent ==6.0.0 - hinfo ==0.0.3.0 @@ -1114,11 +1114,11 @@ default-package-overrides: - hpc-lcov ==1.1.1 - HPDF ==1.6.2 - hpp ==0.6.5 - - hpqtypes ==1.11.1.1 + - hpqtypes ==1.11.1.2 - hpqtypes-extras ==1.16.4.4 - hreader ==1.1.1 - hreader-lens ==0.1.3.0 - - hruby ==0.5.0.0 + - hruby ==0.5.1.0 - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 - hsc2hs ==0.68.10 @@ -1159,7 +1159,7 @@ default-package-overrides: - hspec-core ==2.10.10 - hspec-discover ==2.10.10 - hspec-expectations ==0.8.2 - - hspec-expectations-json ==1.0.2.0 + - hspec-expectations-json ==1.0.2.1 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.6 - hspec-golden ==0.2.1.0 @@ -1311,7 +1311,7 @@ default-package-overrides: - intset-imperative ==0.1.0.0 - invariant ==0.6.2 - invert ==1.0.0.4 - - invertible-grammar ==0.1.3.4 + - invertible-grammar ==0.1.3.5 - io-machine ==0.2.0.0 - io-manager ==0.1.0.4 - io-memoize ==1.1.1.0 @@ -1350,7 +1350,7 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.10 - - json-feed ==2.0.0.9 + - json-feed ==2.0.0.10 - jsonifier ==0.2.1.2 - jsonpath ==0.3.0.0 - json-rpc ==1.0.4 @@ -1387,7 +1387,7 @@ default-package-overrides: - koji ==0.0.2 - krank ==0.3.0 - labels ==0.3.3 - - lackey ==2.0.0.6 + - lackey ==2.0.0.7 - LambdaHack ==0.11.0.1 - lame ==0.2.2 - language-avro ==0.1.4.0 @@ -1440,7 +1440,7 @@ default-package-overrides: - libgit ==0.3.1 - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - - lifted-async ==0.10.2.4 + - lifted-async ==0.10.2.5 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 - lift-type ==0.1.1.1 @@ -1519,7 +1519,7 @@ default-package-overrides: - mathlist ==0.2.0.0 - matplotlib ==0.7.7 - matrices ==0.5.0 - - matrix ==0.3.6.1 + - matrix ==0.3.6.3 - matrix-as-xyz ==0.1.2.2 - matrix-market-attoparsec ==0.1.1.3 - matrix-static ==0.3 @@ -1721,7 +1721,7 @@ default-package-overrides: - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 - not-gloss ==0.7.7.0 - - nothunks ==0.1.4 + - nothunks ==0.1.5 - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.4 @@ -1835,7 +1835,7 @@ default-package-overrides: - pathtype ==0.8.1.2 - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 - - patrol ==1.0.0.5 + - patrol ==1.0.0.6 - pattern-arrows ==0.0.2 - pava ==0.1.1.4 - pcf-font ==0.2.2.1 @@ -1892,7 +1892,7 @@ default-package-overrides: - pipes-ordered-zip ==1.2.1 - pipes-parse ==3.0.9 - pipes-random ==1.0.0.5 - - pipes-safe ==2.3.4 + - pipes-safe ==2.3.5 - pipes-text ==1.0.1 - pipes-wai ==3.2.0 - pkgtreediff ==0.6.0 @@ -1942,7 +1942,7 @@ default-package-overrides: - pretty-hex ==1.1 - prettyprinter ==1.7.1 - prettyprinter-ansi-terminal ==1.1.3 - - prettyprinter-combinators ==0.1.1.1 + - prettyprinter-combinators ==0.1.2 - prettyprinter-compat-annotated-wl-pprint ==1.1 - prettyprinter-compat-ansi-wl-pprint ==1.0.2 - prettyprinter-compat-wl-pprint ==1.0.1 @@ -1987,7 +1987,7 @@ default-package-overrides: - PSQueue ==1.2.0 - psqueues ==0.2.8.0 - pthread ==0.2.1 - - ptr ==0.16.8.4 + - ptr ==0.16.8.5 - ptr-poker ==0.1.2.13 - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 @@ -2026,7 +2026,7 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2.1 - - rampart ==2.0.0.6 + - rampart ==2.0.0.7 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.2.1.1 @@ -2042,9 +2042,9 @@ default-package-overrides: - rank1dynamic ==0.4.1 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - - ratel ==2.0.0.9 + - ratel ==2.0.0.10 - rate-limit ==1.4.3 - - ratel-wai ==2.0.0.4 + - ratel-wai ==2.0.0.5 - ratio-int ==0.1.2 - rattle ==0.2 - rattletrap ==12.0.3 @@ -2163,7 +2163,7 @@ default-package-overrides: - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - saltine ==0.2.1.0 - - salve ==2.0.0.3 + - salve ==2.0.0.4 - sample-frame ==0.0.4 - sample-frame-np ==0.0.5 - sampling ==0.3.5 @@ -2210,7 +2210,7 @@ default-package-overrides: - seqid-streams ==0.7.2 - sequence-formats ==1.7.1 - sequenceTools ==1.5.3.1 - - serialise ==0.2.6.0 + - serialise ==0.2.6.1 - servant ==0.19.1 - servant-auth ==0.4.1.0 - servant-auth-client ==0.4.1.1 @@ -2257,7 +2257,7 @@ default-package-overrides: - setlocale ==1.0.0.10 - set-monad ==0.3.0.0 - sets ==0.0.6.2 - - sexp-grammar ==2.3.4.1 + - sexp-grammar ==2.3.4.2 - SHA ==1.6.4.4 - shake ==0.19.7 - shake-plus ==0.3.4.0 @@ -2396,7 +2396,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.4.0 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.3.1 + - streaming-bytestring ==0.3.2 - streaming-commons ==0.2.2.6 - streaming-wai ==0.1.1 - streamly ==0.9.0 @@ -2409,7 +2409,7 @@ default-package-overrides: - strict-base-types ==0.8 - strict-concurrency ==0.2.4.3 - strict-lens ==0.4.0.3 - - strict-list ==0.1.7.2 + - strict-list ==0.1.7.4 - strict-tuple ==0.1.5.3 - strict-wrapper ==0.0.0.0 - stringable ==0.1.3 @@ -2428,7 +2428,7 @@ default-package-overrides: - stripe-scotty ==1.1.0.4 - stripe-signature ==1.0.0.16 - stripe-wreq ==1.0.1.16 - - strive ==6.0.0.9 + - strive ==6.0.0.10 - structs ==0.1.9 - structured ==0.1.1 - structured-cli ==2.7.0.1 @@ -2531,8 +2531,8 @@ default-package-overrides: - tensors ==0.1.5 - termbox ==1.1.0.2 - termbox-banana ==1.0.0 - - termbox-bindings-c ==0.1.0 - - termbox-bindings-hs ==0.1.0 + - termbox-bindings-c ==0.1.0.1 + - termbox-bindings-hs ==0.1.1 - termbox-tea ==0.1.0.1 - terminal-progress-bar ==0.4.2 - terminal-size ==0.3.4 @@ -2550,7 +2550,7 @@ default-package-overrides: - text-binary ==0.2.1.1 - text-builder ==0.6.7 - text-builder-dev ==0.3.3.2 - - text-builder-linear ==0.1.1.1 + - text-builder-linear ==0.1.2 - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 - text-icu ==0.8.0.4 @@ -2778,7 +2778,7 @@ default-package-overrides: - vector-buffer ==0.4.1 - vector-builder ==0.3.8.4 - vector-bytes-instances ==0.1.1 - - vector-extras ==0.2.8 + - vector-extras ==0.2.8.1 - vector-hashtables ==0.1.1.3 - vector-instances ==3.4.2 - vector-mmap ==0.0.3 @@ -2855,7 +2855,7 @@ default-package-overrides: - wide-word ==0.1.6.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.2.0.2 + - witch ==1.2.0.3 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 @@ -2925,7 +2925,7 @@ default-package-overrides: - yesod-auth ==1.6.11.2 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - - yesod-auth-oauth2 ==0.7.1.2 + - yesod-auth-oauth2 ==0.7.1.3 - yesod-auth-oidc ==0.1.4 - yesod-bin ==1.6.2.2 - yesod-core ==1.6.25.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e3525ba907601..87df614acb81c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -116,6 +116,7 @@ dont-distribute-packages: - FiniteCategoriesGraphViz - FiniteMap - FirstOrderTheory + - Flint2-Examples - Flippi - ForSyDe - Forestry @@ -1309,6 +1310,7 @@ dont-distribute-packages: - fast-bech32 - fastcdc - fastirc + - fastparser - fault-tree - fay-base - fay-builder @@ -3457,6 +3459,7 @@ dont-distribute-packages: - samtools-conduit - samtools-enumerator - samtools-iteratee + - sandwich_0_2_0_0 - sarsi - sasha - sasl diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index fcd37d55f1cd8..3f7672fb8e180 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1095,7 +1095,7 @@ self: super: builtins.intersectAttrs super { ''; }) (lib.pipe (super.cachix.override { - hnix-store-core = self.hnix-store-core_0_6_1_0; + hnix-store-core = self.hnix-store-core_0_7_0_0; nix = self.hercules-ci-cnix-store.nixPackage; }) [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e608ebeec372a..d67256774b407 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6390,21 +6390,44 @@ self: { }) {}; "Flint2" = callPackage - ({ mkDerivation, base, flint, gmp, groups, QuickCheck }: + ({ mkDerivation, base, containers, flint, gmp, groups, QuickCheck + }: mkDerivation { pname = "Flint2"; - version = "0.1.0.1"; - sha256 = "1jw0x82mgqy4pxwxpyv0crz7n72kv255iq4pxr8c5xkvsw6w2w5i"; - libraryHaskellDepends = [ base groups QuickCheck ]; - librarySystemDepends = [ flint gmp ]; + version = "0.1.0.5"; + sha256 = "0hldi7kknhb4kl228b658skn2irakmshb84dqmdgpy76v5b7klxx"; + libraryHaskellDepends = [ base containers groups QuickCheck ]; + librarySystemDepends = [ flint ]; libraryPkgconfigDepends = [ flint gmp ]; testHaskellDepends = [ base ]; description = "Haskell bindings for the flint library for number theory"; - license = lib.licenses.bsd3; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) flint; inherit (pkgs) gmp;}; + "Flint2-Examples" = callPackage + ({ mkDerivation, base, containers, filepath, Flint2, gloss + , gloss-juicy, JuicyPixels, mtl, optparse-applicative, time, timeit + }: + mkDerivation { + pname = "Flint2-Examples"; + version = "0.1.0.2"; + sha256 = "1dyy1wfllxrx56aws4s55bpyiw89ad2jm033pa7zhv9628g8ymar"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers filepath Flint2 gloss gloss-juicy JuicyPixels mtl + optparse-applicative time timeit + ]; + testHaskellDepends = [ + base containers Flint2 mtl optparse-applicative timeit + ]; + description = "Examples for the Flint2 library"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "Flippi" = callPackage ({ mkDerivation, base, cgi, containers, directory, haskell98 , old-time, parsec, xhtml @@ -10446,6 +10469,28 @@ self: { broken = true; }) {CacBDD = null;}; + "HasChor" = callPackage + ({ mkDerivation, async, base, bytestring, containers, http-client + , random, servant, servant-client, servant-server, split + , template-haskell, time, transformers, unordered-containers, warp + }: + mkDerivation { + pname = "HasChor"; + version = "0.1.0.1"; + sha256 = "062gn52146vhlfc71zlbx3sbfkid5if22yhba9ngnc0wb0115k81"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-client servant servant-client servant-server + template-haskell unordered-containers warp + ]; + executableHaskellDepends = [ + async base containers random split time transformers + ]; + description = "Functional choreographic programming in Haskell"; + license = lib.licenses.bsd3; + }) {}; + "HasGP" = callPackage ({ mkDerivation, base, haskell98, hmatrix, hmatrix-special, mtl , parsec, random @@ -20081,8 +20126,8 @@ self: { pname = "Spock-core"; version = "0.14.0.1"; sha256 = "0a93v9pxbvd9qqpx9rnv6gqpc5y8xh5dkfi0lkc566pj9cv8bpad"; - revision = "1"; - editedCabalFile = "1kxi4bigll1gn9rcp8x3h4waycihycvh6bhvfjzxdyzhm3ifq48a"; + revision = "2"; + editedCabalFile = "09x9xvhdw0k0f9qswbd8g32kjsa34i4rdy117hl7zk0s5scin02a"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers cookie hashable http-api-data http-types hvect mmorph monad-control @@ -35880,35 +35925,6 @@ self: { "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal - , clock, colour, containers, exceptions, hspec, hspec-discover - , linebreak, mintty, mtl, QuickCheck, random, split, terminal-size - , timers-tick, unidecode - }: - mkDerivation { - pname = "ansi-terminal-game"; - version = "1.9.1.3"; - sha256 = "0ln6cx98g7nv6yv600m7p721pscln1c10wkmmykwlfvsrrvnvk7w"; - revision = "2"; - editedCabalFile = "01kfj2qz0s5jygd49ixj2cgzcmikbqb3rhwxs4n8cx3acqzx6cpx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal array base bytestring cereal clock colour containers - exceptions linebreak mintty mtl QuickCheck random split - terminal-size timers-tick unidecode - ]; - testHaskellDepends = [ - ansi-terminal array base bytestring cereal clock colour containers - exceptions hspec linebreak mintty mtl QuickCheck random split - terminal-size timers-tick unidecode - ]; - testToolDepends = [ hspec-discover ]; - description = "cross-platform library for terminal games"; - license = lib.licenses.gpl3Only; - }) {}; - - "ansi-terminal-game_1_9_2_0" = callPackage - ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, colour, containers, exceptions, file-embed, hspec , hspec-discover, linebreak, mintty, mtl, QuickCheck, random, split , terminal-size, timers-tick, unidecode @@ -35932,7 +35948,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "cross-platform library for terminal games"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "ansi-terminal-types" = callPackage @@ -38158,8 +38173,8 @@ self: { pname = "arch-hs"; version = "0.11.1.0"; sha256 = "1f50id3xplp8zwi379n6xi4in01gms97qbqnfxnsqzrv47xszwj4"; - revision = "3"; - editedCabalFile = "1924crg373xid7pxcpi178njmiiaq1m8cf59y96zjhaw4z07054q"; + revision = "4"; + editedCabalFile = "1qizarnjfzlml2v0bpdswhxdapakyhqil4avvmflzg4s3fm31m7l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42067,21 +42082,6 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "2.0.0.8"; - sha256 = "1a4647kh0jzpl8lkm5vl4yg9307dnfxlvlk2pppnahxdy47r6vnk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base Cabal directory filepath ]; - description = "Automatically re-export modules"; - license = lib.licenses.mit; - mainProgram = "autoexporter"; - }) {}; - - "autoexporter_2_0_0_9" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; version = "2.0.0.9"; sha256 = "1rkql1v29gsgq3y9gmsrfxgm43rgwhk32g32gjxbfgr4ky79696g"; isLibrary = true; @@ -42090,7 +42090,6 @@ self: { executableHaskellDepends = [ base Cabal directory filepath ]; description = "Automatically re-export modules"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "autoexporter"; }) {}; @@ -47849,6 +47848,8 @@ self: { pname = "binary-serialise-cbor"; version = "0.2.2.0"; sha256 = "16yhimka17dza5nda62927k5x66c0yrsxzz92kya3gicd6vaga2g"; + revision = "1"; + editedCabalFile = "1kampfsd9mm2qv726v4dyq0ssx8ismj4hjm61h0jjx9644c8cr18"; libraryHaskellDepends = [ base bytestring cborg serialise ]; description = "Yet Another Binary Serialisation Library (compatibility shim)"; license = lib.licenses.bsd3; @@ -52108,16 +52109,16 @@ self: { }) {}; "bookhound" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-discover + ({ mkDerivation, base, containers, hspec, hspec-discover, mtl , QuickCheck, quickcheck-instances, text, time }: mkDerivation { pname = "bookhound"; - version = "0.1.25.0"; - sha256 = "0kdsr01iwnf9jzb4sfh7mcsnffzxmvfiziz5h2214py8ya3rbi5c"; - libraryHaskellDepends = [ base containers text time ]; + version = "0.2.0"; + sha256 = "0gv9n2nfgcfj1sv68c9llkf4f60vcb5qmcyjw4ijg2dd344yl6z1"; + libraryHaskellDepends = [ base containers mtl text time ]; testHaskellDepends = [ - base containers hspec QuickCheck quickcheck-instances text time + base containers hspec mtl QuickCheck quickcheck-instances text time ]; testToolDepends = [ hspec-discover ]; description = "Simple Parser Combinators"; @@ -53073,8 +53074,8 @@ self: { ({ mkDerivation, array, base, mtl, unix }: mkDerivation { pname = "brainfuck"; - version = "0.1.0.3"; - sha256 = "1xlbcvcx6dvrj4x5vqjyvyhazq0hzl1fa17xfcb3m2pc241kgd8d"; + version = "0.1.0.4"; + sha256 = "01sgz28jbrjb61rx173ar0kwmh00j2zk4lnjgfc8apwrjigsbr6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base mtl ]; @@ -53389,8 +53390,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.8"; - sha256 = "0zaqyhvzw5mw5xj3n71578nslg5h3i5k354xck3f2si2sp73kzxm"; + version = "0.1.1.9"; + sha256 = "1dmvpnv904vqyv0z5lf36kdsxvdb9r2k637lrsbis1jvmg9719cm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -53462,8 +53463,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.6"; - sha256 = "1ba3g0qx0hgybj9yiy7afrxfj6nyfqqhj8pwf7lcb5jpm5sqn91d"; + version = "2.2.0.7"; + sha256 = "12qn87lzvic12d7g84a23vddiwsk8qi5r5by9569pra3zi7790kc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54841,26 +54842,6 @@ self: { }: mkDerivation { pname = "burrito"; - version = "2.0.1.6"; - sha256 = "1q8ahf5czy2lc8jvlx648ns6ir7q6wmb3zrgzksvznrrb8r163hv"; - libraryHaskellDepends = [ - base bytestring containers parsec template-haskell text - transformers - ]; - testHaskellDepends = [ - base bytestring containers hspec parsec QuickCheck template-haskell - text transformers - ]; - description = "Parse and render URI templates"; - license = lib.licenses.mit; - }) {}; - - "burrito_2_0_1_7" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, parsec - , QuickCheck, template-haskell, text, transformers - }: - mkDerivation { - pname = "burrito"; version = "2.0.1.7"; sha256 = "1b7xijr8ry4q1k3ix2nzbrvaiwrk4gdzbl79kxl3d7s2zxgnngww"; libraryHaskellDepends = [ @@ -54873,7 +54854,6 @@ self: { ]; description = "Parse and render URI templates"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "burst-detection" = callPackage @@ -55768,8 +55748,8 @@ self: { }: mkDerivation { pname = "bytestring-lexing"; - version = "0.5.0.10"; - sha256 = "0mvqiss323vwvgqx2pv8cww1mkx29hpi094ff54hx545mmvhwb16"; + version = "0.5.0.11"; + sha256 = "16qvykzai61dyc403cplxar8frd0p4x3681zrl874ck3c19qj0jw"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring tasty tasty-quickcheck tasty-smallcheck @@ -57501,29 +57481,6 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "2.1.3"; - sha256 = "0wkb1h08ns93gkwycbsi7ap49px05kaybw5badjg1633n0i2bmww"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring Cabal cached-json-file directory extra - filepath http-client http-client-tls http-conduit http-query - optparse-applicative process simple-cabal simple-cmd - simple-cmd-args text time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = lib.licenses.gpl3Only; - mainProgram = "cabal-rpm"; - }) {}; - - "cabal-rpm_2_1_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, cached-json-file - , directory, extra, filepath, http-client, http-client-tls - , http-conduit, http-query, optparse-applicative, process - , simple-cabal, simple-cmd, simple-cmd-args, text, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; version = "2.1.4"; sha256 = "059vqbh97cydybvbwbn5cgrpw3bx7rkizy8j0nsqfyaxjvvj8lvg"; isLibrary = false; @@ -57536,7 +57493,6 @@ self: { ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-rpm"; }) {}; @@ -59102,6 +59058,8 @@ self: { pname = "canonical-json"; version = "0.6.0.1"; sha256 = "0znfbazzcx33xi2gi44vqhhdl9ja308zkxydarwkacwd0pckkprk"; + revision = "1"; + editedCabalFile = "180c35znblvf3j59si48n4a9qpwwprq8d7xh86fpmjj2sn2g1sj8"; libraryHaskellDepends = [ base bytestring containers deepseq parsec pretty ]; @@ -60435,6 +60393,25 @@ self: { license = lib.licenses.mit; }) {}; + "cassava-megaparsec_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec + , megaparsec, unordered-containers, vector + }: + mkDerivation { + pname = "cassava-megaparsec"; + version = "2.1.0"; + sha256 = "02nw6rxb8yvn09qrbl7msdjl7vk759vyzz8dighgi2b94vzwdanv"; + libraryHaskellDepends = [ + base bytestring cassava megaparsec unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring cassava hspec hspec-megaparsec vector + ]; + description = "Megaparsec parser of CSV files that plays nicely with Cassava"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "cassava-records" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cassava, containers , foldl, HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -60944,8 +60921,8 @@ self: { pname = "cbor-tool"; version = "0.2.2.0"; sha256 = "0rsnnz1zh9jyjif94lrdppzaa41hypqs1r5dlyzbwlw1m75g286p"; - revision = "4"; - editedCabalFile = "1wr6dlijy5j1b88bfmyvzj5pdipw6rcb40gfik678apr2q7gw0i6"; + revision = "5"; + editedCabalFile = "0lwxyz8c9mrhq4lqdwwv0y82islakbhwv1jlmjw20ha47g1mg69n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60968,8 +60945,8 @@ self: { }: mkDerivation { pname = "cborg"; - version = "0.2.9.0"; - sha256 = "1apwdb0y08l3mbxb6pb006355nnn1lag035dvm006v7h4cbqvd6w"; + version = "0.2.10.0"; + sha256 = "15y7p5rsv76fpklh4rgrxlxxaivpbchxdfdw96mqqjgw7060gzhp"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -60984,19 +60961,22 @@ self: { }) {}; "cborg-json" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cborg - , criterion, deepseq, directory, process, scientific, text - , unordered-containers, vector, zlib + ({ mkDerivation, aeson, aeson-pretty, base, base-orphans + , base16-bytestring, base64-bytestring, bytestring, cborg + , criterion, deepseq, directory, process, QuickCheck, scientific + , tasty, tasty-hunit, text, unordered-containers, vector, zlib }: mkDerivation { pname = "cborg-json"; - version = "0.2.5.0"; - sha256 = "1m3w0yyp6xb07fx04g5c52pb0b46vpkgpi32w1c8bz867x2p7hsq"; - revision = "2"; - editedCabalFile = "1bd2s7dr9jl88pd2wwllb8badhshafnnkq6lmds93sxavv4i92r8"; + version = "0.2.6.0"; + sha256 = "1p6xdimwypmlsc0zdyw1vyyapnhwn2g8b9n0a83ca6h4r90722yv"; libraryHaskellDepends = [ - aeson aeson-pretty base cborg scientific text unordered-containers - vector + aeson aeson-pretty base base64-bytestring cborg scientific text + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base base-orphans base16-bytestring bytestring cborg + QuickCheck tasty tasty-hunit text ]; benchmarkHaskellDepends = [ aeson base bytestring cborg criterion deepseq directory process @@ -64415,8 +64395,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.8.0"; - sha256 = "1cjqm23d2977aiya81i9q1npyd4zxmbv81k4agqggdkl8h9rcn8w"; + version = "1.8.1"; + sha256 = "1xjf3z043sn7r35pkbpyxl4agyl2hz3mj7iikridxsddjqrmr5y4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64451,8 +64431,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "1.8.0"; - sha256 = "1f2kmgasgbpnw0gd308mhzc7qb4ng36js7l9gvk0xgm425lxavq0"; + version = "1.8.1"; + sha256 = "1s31d0pdzm5zk62gz4g1xp2yalyal2gk3n46y2rwpxl440mchyy5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -64493,8 +64473,8 @@ self: { }: mkDerivation { pname = "clash-lib-hedgehog"; - version = "1.8.0"; - sha256 = "0bmlrwwm5hp67fm8a9d089fwmrcnknvd2gijriwzk1kxbvfyhynk"; + version = "1.8.1"; + sha256 = "1cnw5i6k376l293f1vlihc22ilapms8brl7726rxr2whrq5sb7r8"; libraryHaskellDepends = [ base clash-lib containers data-binary-ieee754 fakedata ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog @@ -64536,8 +64516,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "1.8.0"; - sha256 = "01psmi229lgpfc10p0p4gvpqfklwfmgvjwvqifnv77d4jbqjimiq"; + version = "1.8.1"; + sha256 = "13y43lsw55jpmr04x6yrrppma9qdqzlvrwbs4jkvc3g7jmydnb3y"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum @@ -64568,8 +64548,8 @@ self: { }: mkDerivation { pname = "clash-prelude-hedgehog"; - version = "1.8.0"; - sha256 = "0vll5ff7dhjx2q9xpj3q961dmhgi306w577kxfm11sccvjix2pbh"; + version = "1.8.1"; + sha256 = "12g2z845j2pqb3jxkyrj038l8pp9a8sw5fjay5l1pwl8kh8winkk"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog text @@ -67640,31 +67620,6 @@ self: { }: mkDerivation { pname = "coinor-clp"; - version = "0.0"; - sha256 = "1wfi1f4g3n0prks74iww5092nkiyl0d6hmf2yfqlvj6zwcly3kfn"; - libraryHaskellDepends = [ - base comfort-array deepseq linear-programming non-empty QuickCheck - transformers utility-ht - ]; - libraryPkgconfigDepends = [ clp ]; - testHaskellDepends = [ - base comfort-array doctest-exitcode-stdio doctest-lib - linear-programming non-empty QuickCheck random transformers - utility-ht - ]; - description = "Linear Programming using COIN-OR/CLP and comfort-array"; - license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; - maintainers = [ lib.maintainers.thielema ]; - }) {inherit (pkgs) clp;}; - - "coinor-clp_0_0_0_1" = callPackage - ({ mkDerivation, base, clp, comfort-array, deepseq - , doctest-exitcode-stdio, doctest-lib, linear-programming - , non-empty, QuickCheck, random, transformers, utility-ht - }: - mkDerivation { - pname = "coinor-clp"; version = "0.0.0.1"; sha256 = "02jrmb0fbgwzhgcnhv4hh1flz87rvs1xq3sbjrjac7cxxyl3inba"; libraryHaskellDepends = [ @@ -67680,7 +67635,6 @@ self: { description = "Linear Programming using COIN-OR/CLP and comfort-array"; license = lib.licenses.bsd3; badPlatforms = [ "aarch64-linux" ]; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) clp;}; @@ -70799,6 +70753,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "cond_0_5_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "cond"; + version = "0.5.1"; + sha256 = "06pm5y8f9jybw9ns1p4rmf9z3nrwl394814f77lsmsqv4z0kn58q"; + libraryHaskellDepends = [ base ]; + description = "Basic conditional and boolean operators with monadic variants"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "conditional-restriction-parser" = callPackage ({ mkDerivation, base, cmdargs, hourglass, hspec, QuickCheck }: mkDerivation { @@ -71801,24 +71767,6 @@ self: { }: mkDerivation { pname = "config-ini"; - version = "0.2.6.0"; - sha256 = "0pvsvl3svh7y3pi7kw4fsnl6p92sxl4sa0px26c135klvwsq2a1a"; - libraryHaskellDepends = [ - base containers megaparsec text transformers unordered-containers - ]; - testHaskellDepends = [ - base containers directory hedgehog ini text unordered-containers - ]; - description = "A library for simple INI-based configuration files"; - license = lib.licenses.bsd3; - }) {}; - - "config-ini_0_2_7_0" = callPackage - ({ mkDerivation, base, containers, directory, hedgehog, ini - , megaparsec, text, transformers, unordered-containers - }: - mkDerivation { - pname = "config-ini"; version = "0.2.7.0"; sha256 = "00b9b590566hrxrjn31jkq70768dnrzzsjrasrnhdvd6p92iq5rs"; libraryHaskellDepends = [ @@ -71829,7 +71777,6 @@ self: { ]; description = "A library for simple INI-based configuration files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "config-manager" = callPackage @@ -79917,6 +79864,8 @@ self: { pname = "data-clist"; version = "0.2"; sha256 = "04mj0d1yp0l27v2my51w9q5zpdrdhp29fdyvmwqgxxp8f6yiwfhw"; + revision = "1"; + editedCabalFile = "09922p8ydfgqsy29p9qfiss70bks85bzz6g9s3gzrd93lpzhiba7"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base QuickCheck ]; description = "Simple functional ring type"; @@ -83779,6 +83728,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "delaunayNd" = callPackage + ({ mkDerivation, base, containers, extra, hashable, ilist + , insert-ordered-containers, split, Unique + }: + mkDerivation { + pname = "delaunayNd"; + version = "0.1.0.1"; + sha256 = "13zqzfbhm5hqij2ispk4b6gy04nm5fnlzmcrp07yn68m5mny3lp1"; + libraryHaskellDepends = [ + base containers extra hashable ilist insert-ordered-containers + split Unique + ]; + description = "Delaunay tessellation"; + license = lib.licenses.gpl3Only; + }) {}; + "delay" = callPackage ({ mkDerivation, async, base, dimensional, exceptions, mtl, time , unbounded-delays @@ -84436,24 +84401,6 @@ self: { }) {}; "deque" = callPackage - ({ mkDerivation, base, deepseq, hashable, mtl, QuickCheck - , quickcheck-instances, rerebase, strict-list, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "deque"; - version = "0.4.4"; - sha256 = "1x0rjdqgf4kwgpyisx618waz6r9gki3ivav9m4biysyc04hdhinn"; - libraryHaskellDepends = [ base deepseq hashable mtl strict-list ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Double-ended queues"; - license = lib.licenses.mit; - }) {}; - - "deque_0_4_4_1" = callPackage ({ mkDerivation, base, deepseq, hashable, mtl, rerebase , strict-list, tasty, tasty-quickcheck }: @@ -84465,7 +84412,6 @@ self: { testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; description = "Double-ended queues"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "dequeue" = callPackage @@ -86006,8 +85952,8 @@ self: { pname = "dhall-recursive-adt"; version = "0.1.0.1"; sha256 = "09s3m86vflj5im2walab8d0wpvihsvxc5mzy55m10pfzr3gxsd11"; - revision = "4"; - editedCabalFile = "0ym561whhaiszvqpdfbbzng3891n36fkwgaspyfhl5gz7pdqr6v9"; + revision = "5"; + editedCabalFile = "1b45x3xwc9qzw37jgf0plpsz9kl29925z3kxa3igmwh4hjfxxrws"; libraryHaskellDepends = [ base data-fix dhall recursion-schemes ]; testHaskellDepends = [ base dhall either hedgehog recursion-schemes tasty tasty-hedgehog @@ -86544,8 +86490,8 @@ self: { }: mkDerivation { pname = "diagrams-core"; - version = "1.5.1"; - sha256 = "08bmb2r4gf7arc0wasxla6w1qpgrgrhcs24bb7sv2qgiyb6c22j6"; + version = "1.5.1.1"; + sha256 = "168kjikw3x21pjgfy3lmxmrm89g9zlhbypkmzdg5xz9rl7acn7rc"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -90585,6 +90531,8 @@ self: { pname = "docopt"; version = "0.7.0.7"; sha256 = "0q3f9j7yqyb97z08h2k6p6bax87g6ab96ng4cpj1xf5k91726ic1"; + revision = "1"; + editedCabalFile = "15lha2pf1yhj6ka57mdg414582cl0h140qc42ddz6cvj9a62bd66"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers parsec template-haskell @@ -94931,14 +94879,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-core_2_3_0_0" = callPackage + "effectful-core_2_3_0_1" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core }: mkDerivation { pname = "effectful-core"; - version = "2.3.0.0"; - sha256 = "1yrywdzys1fsg0403g5slg88a33hnk5cm0cshrb2idhsv77bfhkv"; + version = "2.3.0.1"; + sha256 = "16vk5sjyy4knw9yss25iv501zxz2258qds3bhl1mrqa24phy3c9w"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -97766,8 +97714,8 @@ self: { }: mkDerivation { pname = "enummapset"; - version = "0.7.1.0"; - sha256 = "1zhfl1qrm7r124v0xphh50lnll7cgmlacdmxwwlwhmzyrp1bwf69"; + version = "0.7.2.0"; + sha256 = "00n6nifk5hlp85mv0g68jpx9w19hx1cxqhbf7pqlm5m5f99y29m2"; libraryHaskellDepends = [ aeson base containers deepseq ]; testHaskellDepends = [ aeson array base containers deepseq ghc-prim HUnit QuickCheck @@ -100648,6 +100596,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "exception-hierarchy_0_1_0_9" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "exception-hierarchy"; + version = "0.1.0.9"; + sha256 = "0xplq1kfmymfnb68hba66qzj2jmhazbhpm154lyjm9ybkn23hl7g"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Exception type hierarchy with TemplateHaskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -101322,8 +101282,8 @@ self: { }: mkDerivation { pname = "exon"; - version = "1.6.0.2"; - sha256 = "17hq0ywafh72cskqh7mbfbq6lgc4j3szvfnz4sf6m84llzzvbdv9"; + version = "1.6.1.0"; + sha256 = "0cdsh3qhbiw4q0nskcwgbbd1zdy0jhy9iblqx5h079drc0faa3zp"; libraryHaskellDepends = [ base ghc incipit-base parsec template-haskell ]; @@ -103345,6 +103305,7 @@ self: { benchmarkHaskellDepends = [ base bytestring ]; description = "A fast, but bare bones, bytestring parser combinators library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "fastpbkdf2" = callPackage @@ -104132,6 +104093,28 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "fedora-haskell-tools_1_1" = callPackage + ({ mkDerivation, base, bytestring, csv, directory, extra + , fedora-dists, filepath, http-conduit, http-types + , optparse-applicative, process, simple-cmd, simple-cmd-args, split + , time, unix + }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "1.1"; + sha256 = "194jkagrvkhzgw224jybxy4gvavs9qm6lp1b26ddbnpddf3v6paf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring csv directory extra fedora-dists filepath + http-conduit http-types optparse-applicative process simple-cmd + simple-cmd-args split time unix + ]; + description = "Building and maintenance tools for Fedora Haskell"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fedora-img-dl" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , http-directory, http-types, optparse-applicative, simple-cmd @@ -104412,8 +104395,8 @@ self: { }: mkDerivation { pname = "feedback"; - version = "0.1.0.1"; - sha256 = "18934n0fwz3q7mgfzc0phwxfng3qakf5hw14iyhal57ks7gm7j2y"; + version = "0.1.0.3"; + sha256 = "1an4w44p1abicjkb22whkrkhrl66p3f2vfrr70q8jbkwvws0wx8w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106630,25 +106613,12 @@ self: { ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; - version = "1.2.2.1"; - sha256 = "0kp747v67x1ija33nyqmyh6g178pqn2c7glynrpzcv733lalp00z"; - libraryHaskellDepends = [ base deepseq primitive ]; - testHaskellDepends = [ base doctest filemanip primitive ]; - description = "Generic vectors with statically known size"; - license = lib.licenses.bsd3; - }) {}; - - "fixed-vector_1_2_3_0" = callPackage - ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: - mkDerivation { - pname = "fixed-vector"; version = "1.2.3.0"; sha256 = "0cbz734dccsy3jvhszszyrnls6bbys4gaq326dksaabwv6mn58vc"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fixed-vector-binary" = callPackage @@ -107600,10 +107570,8 @@ self: { }: mkDerivation { pname = "flock"; - version = "0.3.2"; - sha256 = "0zi04gmrjda11zp8y7zx6r9hkz00wplvjj7sn6q7lbm2h5kv20xr"; - revision = "1"; - editedCabalFile = "18mhjwcrz2jx0vsdd8cyb84lnabhliwfxaw76k8sifarhk847af8"; + version = "0.3.2.1"; + sha256 = "14jpfwgjy6l0m00fs17n32jqk8xdwa3hmhfgs6nl8wd3qnz0rzsz"; libraryHaskellDepends = [ base lifted-base monad-control transformers unix ]; @@ -107689,25 +107657,12 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; - version = "2.0.0.3"; - sha256 = "0hm1bx63k0cm8jkfb8rqfsrv88gr7jn15agrxxngawr59xbv3r2p"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Write more understandable Haskell"; - license = lib.licenses.mit; - }) {}; - - "flow_2_0_0_4" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "flow"; version = "2.0.0.4"; sha256 = "079r6cjs7wz7kxql1m45pazf0nya8xgiil3sbcqrr2csxmam23cr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "flow-er" = callPackage @@ -109713,8 +109668,8 @@ self: { }: mkDerivation { pname = "fp-ieee"; - version = "0.1.0.2"; - sha256 = "0zfrjqyi3pvfmsidq2vsfwqaah0ag6pkixlxicr43jmfyrhi4snl"; + version = "0.1.0.3"; + sha256 = "1g7wmrf5r09ab3n4rjcariljwsq56q10z9yqdlp04lziv054iggg"; libraryHaskellDepends = [ base ghc-bignum integer-logarithms ]; testHaskellDepends = [ base doctest hspec hspec-core integer-logarithms QuickCheck random @@ -109722,6 +109677,8 @@ self: { benchmarkHaskellDepends = [ base tasty-bench ]; description = "IEEE 754-2019 compliant operations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fpco-api" = callPackage @@ -112480,22 +112437,6 @@ self: { }: mkDerivation { pname = "fusion-plugin"; - version = "0.2.6"; - sha256 = "0dmcnqbxxh8iahimblhwsvyqr80bj9l1gky5xwn2jb120blm7w53"; - libraryHaskellDepends = [ - base containers directory filepath fusion-plugin-types ghc syb time - transformers - ]; - description = "GHC plugin to make stream fusion more predictable"; - license = lib.licenses.asl20; - }) {}; - - "fusion-plugin_0_2_7" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , fusion-plugin-types, ghc, syb, time, transformers - }: - mkDerivation { - pname = "fusion-plugin"; version = "0.2.7"; sha256 = "0ly2pyhh5s1ahmgkbmm1rqnz035dmniv23w6m2d0vbgxy5mkbb0i"; libraryHaskellDepends = [ @@ -112504,7 +112445,6 @@ self: { ]; description = "GHC plugin to make stream fusion more predictable"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "fusion-plugin-types" = callPackage @@ -112534,8 +112474,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.7"; - sha256 = "1dj0xyk83kkb7zay23rqy92kkmq0rqiyrm3nhw246mhf7swn1rkh"; + version = "0.25.8"; + sha256 = "1jqai6y63lvl80ha7rg7wv4qiykb41sah27h87qxjyzp3vkigsf5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114561,8 +114501,8 @@ self: { pname = "generic-lens-lite"; version = "0.1"; sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6"; - revision = "5"; - editedCabalFile = "1mc7fp8z1zm4k7kl7d4abq73zfkzf19hdviq0gqzgcigyskj97zq"; + revision = "6"; + editedCabalFile = "0db0lbdq3iqgq42bj6q5qn4az8szwjyhq93f32zmcj1n4mrpxdj9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; @@ -114636,8 +114576,8 @@ self: { pname = "generic-monoid"; version = "0.1.0.1"; sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; - revision = "2"; - editedCabalFile = "0p3hk9c6qn5kbgi3a4my3rq5cc43wcl93hx6axgzi5wkvimpv653"; + revision = "3"; + editedCabalFile = "0pyf3yr4haja32nkm3vb28dhdh47cf6h5vqkqih2l6zmbdc2f0lq"; libraryHaskellDepends = [ base ]; description = "Derive monoid instances for product types"; license = lib.licenses.bsd3; @@ -114670,8 +114610,8 @@ self: { pname = "generic-optics-lite"; version = "0.1"; sha256 = "0vf5sk1narj69pdhjqxjj0w3w3i5lxjxn8p98xp8dj0jws4mx9xi"; - revision = "5"; - editedCabalFile = "13ywf3smi7g7yz1pp8afb95dy4x6qq4kvll7chm4bnjl7s3d85kg"; + revision = "6"; + editedCabalFile = "17yqzcdlm3g5mc8rjjqp98ykj8rj1c46c0vcqk23pwgffpac5d25"; libraryHaskellDepends = [ base generic-lens-lite optics-core ]; testHaskellDepends = [ base optics-core ]; description = "Monomorphic field opics like with generic-lens"; @@ -114991,8 +114931,8 @@ self: { pname = "generics-sop-lens"; version = "0.2.0.1"; sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks"; - revision = "4"; - editedCabalFile = "0n3ynw8zaavp5a259slff5b5smah0jfb8lxslkljsmpbndmh5sdv"; + revision = "5"; + editedCabalFile = "0qnfrcg847fpjvg6nrlpndabfnjqm711pbkhd80j3xg59hg6qm72"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = lib.licenses.bsd3; @@ -117295,8 +117235,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.4.7.20230826"; - sha256 = "161ibbb4fyqahamykbdrfrw6zx9djk57vqj785bhrrqxys4k29d5"; + version = "9.4.8.20231111"; + sha256 = "1ccn54srbjnna5abnzkp7fmylwkzv1qsyhgsggrlcfkia10prd9n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -117402,8 +117342,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.4.7.20230826"; - sha256 = "0hnpalndf087mda3hirws31cxjxvgh0h618fc18y2bhmf5hy10gl"; + version = "9.4.8.20231111"; + sha256 = "1zr3fvf5b2wxp6z56bs8gaky62c4m147cx5lwnxmjkl8namwllya"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -118295,8 +118235,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.9"; - sha256 = "1h3d0vjz3j9cgng330dj4zlvnvjkwzk2f76w1q6b5vda5pq676cd"; + version = "0.7.10"; + sha256 = "03rg0p1grmxxzr9w0bgczavnqhvg2jivq8cafqsvqrsrmiacip8d"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -119006,27 +118946,29 @@ self: { , optics, optparse-applicative, os-release, pretty, pretty-terminal , process, QuickCheck, quickcheck-arbitrary-adt, regex-posix , resourcet, retry, safe, safe-exceptions, split, streamly - , strict-base, tagsoup, template-haskell, temporary, terminal-size - , text, time, transformers, unix, unix-bytestring, unliftio-core - , unordered-containers, uri-bytestring, utf8-string, vector - , versions, word8, yaml-streamly, zlib + , strict-base, tagsoup, tasty, tasty-hunit, template-haskell + , temporary, terminal-size, text, time, transformers, unix + , unix-bytestring, unliftio-core, unordered-containers + , uri-bytestring, utf8-string, vector, versions, word8 + , yaml-streamly, zlib }: mkDerivation { pname = "ghcup"; - version = "0.1.19.5"; - sha256 = "1cx93721jz0laakhy8krxbk51l8wxvi3wk0cpdwdcmb4jmzpivxi"; + version = "0.1.20.0"; + sha256 = "1xh1wm7ggj7wl3mys2ivqwn39ds6cjgbsdw64ld12jdmkrdr22qs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base base16-bytestring binary bytestring bz2 Cabal - case-insensitive casing containers cryptohash-sha256 deepseq - directory disk-free-space exceptions filepath haskus-utils-types - haskus-utils-variant libarchive lzma-static megaparsec mtl optics - os-release pretty pretty-terminal regex-posix resourcet retry safe - safe-exceptions split streamly strict-base template-haskell - temporary terminal-size text time transformers unix unix-bytestring - unliftio-core unordered-containers uri-bytestring vector versions - word8 yaml-streamly zlib + aeson aeson-pretty async base base16-bytestring binary bytestring + bz2 Cabal cabal-install-parsers cabal-plan case-insensitive casing + containers cryptohash-sha256 deepseq directory disk-free-space + exceptions filepath haskus-utils-types haskus-utils-variant + libarchive lzma-static megaparsec mtl optics optparse-applicative + os-release pretty pretty-terminal process regex-posix resourcet + retry safe safe-exceptions split streamly strict-base tagsoup + template-haskell temporary terminal-size text time transformers + unix unix-bytestring unliftio-core unordered-containers + uri-bytestring utf8-string vector versions word8 yaml-streamly zlib ]; executableHaskellDepends = [ aeson aeson-pretty async base bytestring cabal-install-parsers @@ -119039,10 +118981,12 @@ self: { ]; testHaskellDepends = [ base bytestring containers directory filepath generic-arbitrary - hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt - streamly text time unix uri-bytestring versions + hspec hspec-golden-aeson optparse-applicative QuickCheck + quickcheck-arbitrary-adt streamly tasty tasty-hunit + template-haskell text time unix uri-bytestring versions ]; testToolDepends = [ hspec-discover ]; + doHaddock = false; description = "ghc toolchain installer"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; @@ -120588,16 +120532,20 @@ self: { }) {}; "gigaparsec" = callPackage - ({ mkDerivation, base, containers, deepseq, gauge, selective, tasty - , tasty-expected-failure, tasty-hunit + ({ mkDerivation, base, bytestring, containers, deepseq, gauge, knob + , pretty-terminal, selective, tasty, tasty-expected-failure + , tasty-hunit }: mkDerivation { pname = "gigaparsec"; - version = "0.2.0.0"; - sha256 = "0x2chdfcnc914dbjjgyxkjnwanmmdl9p0a6pfsnyncv6j1x6bcsz"; - libraryHaskellDepends = [ base containers selective ]; + version = "0.2.1.0"; + sha256 = "0i38ychjdrmw2rxznq7iw7c84mvhx2iq3bxzixmwa26v5zn9nyf7"; + libraryHaskellDepends = [ + base containers pretty-terminal selective + ]; testHaskellDepends = [ - base containers tasty tasty-expected-failure tasty-hunit + base bytestring containers deepseq knob tasty + tasty-expected-failure tasty-hunit ]; benchmarkHaskellDepends = [ base deepseq gauge ]; description = "Refreshed parsec-style library for compatiblity with Scala parsley"; @@ -121538,30 +121486,6 @@ self: { }: mkDerivation { pname = "github-release"; - version = "2.0.0.8"; - sha256 = "1ajx225n0shixh0q0zm5qh9rb254yvs1f393mc8x6j0mry7jp9v3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - executableHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - description = "Upload files to GitHub releases"; - license = lib.licenses.mit; - mainProgram = "github-release"; - }) {}; - - "github-release_2_0_0_9" = callPackage - ({ mkDerivation, aeson, base, burrito, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers - }: - mkDerivation { - pname = "github-release"; version = "2.0.0.9"; sha256 = "0lhaz92jr6ssl1mq5nmcwv6n43wda6mjv2qdzm8rg5275xqpa7jv"; isLibrary = true; @@ -121576,7 +121500,6 @@ self: { ]; description = "Upload files to GitHub releases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "github-release"; }) {}; @@ -126299,8 +126222,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.6.4"; - sha256 = "052n39bnz55d8lmi3d79s0zxhzbspz6a5rw965qqbryi82hgrdp4"; + version = "0.6.6.6"; + sha256 = "024kldfbkpwnn67y8ckmfzcp0v2sp7qp1mlhwrrgdr0hb6di3852"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -128945,8 +128868,8 @@ self: { }: mkDerivation { pname = "gscholar-rss"; - version = "0.3.0.3"; - sha256 = "104c5jvhxzmqnvhc0ww77qy5wmafxmqil4hpcmxvpvx0h0nwdfdl"; + version = "0.3.0.4"; + sha256 = "0vgljhvp6jxwqw8l5sbvd2z6yf549j2xy63xrm4p3yh8xp31sda3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132709,8 +132632,8 @@ self: { }: mkDerivation { pname = "hakyllbars"; - version = "1.0.0.2"; - sha256 = "0zw1jp64zzflgy9hwdd00zkh3vbi8vbfi0qswmqdgr6dk0c390g0"; + version = "1.0.1.0"; + sha256 = "0bd9ss4hp59i5ni5w03zdj2m5phgds36ng3a9nawqic6wyw842g6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132792,6 +132715,8 @@ self: { pname = "half"; version = "0.3.1"; sha256 = "1l8m2spqg0ac50qys2jk5b32v6wxklbbk5ypjp3ga6z14hkw7bz2"; + revision = "1"; + editedCabalFile = "0z0sdic28ji6lq9hz9fh534igy6g3g7b1q799cmwkga23dkicgzl"; libraryHaskellDepends = [ base binary deepseq template-haskell ]; testHaskellDepends = [ base binary bytestring QuickCheck test-framework @@ -132845,8 +132770,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "halfsplit"; - version = "0.4.1.0"; - sha256 = "0mas6a53p44cnfzb26lpsrpgy1zh7vm5i2lxk0invmf35sbaq0w9"; + version = "0.4.2.0"; + sha256 = "1fa2bdch3rqprfvjy3rmhb7zkbzfqnyzi193ayh5zlsmshx5w0cl"; libraryHaskellDepends = [ base ]; description = "A library to provide special kind of two-column output for Phladiprelio"; license = lib.licenses.mit; @@ -137377,8 +137302,8 @@ self: { }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.12"; - sha256 = "12dsv49rzhayp8cvkqkilammq4a6d4nrb2bd2w98ivzzrbkijy02"; + version = "0.8.13"; + sha256 = "09f0lad023zylkxidsz0nv532h44mh0b1505rvs3ypaq2v4q20pa"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -139969,8 +139894,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.6.3.3"; - sha256 = "1w4lpiy4jynzdp1b5fn36zv5jyfgnh0fp8rr6dz7247ajzx7lfq4"; + version = "1.6.3.4"; + sha256 = "1rpyfvy7fzkvviypwf03cfvxgr52ivwym9vsjr10cbqzgnrqb24l"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl network-ip @@ -146216,24 +146141,6 @@ self: { }: mkDerivation { pname = "hi-file-parser"; - version = "0.1.5.0"; - sha256 = "0j6ici0s52fpyf092d3zw4qrvwmz744q538wnxxj48i8fxm7b95m"; - libraryHaskellDepends = [ - base binary bytestring mtl rio text vector - ]; - testHaskellDepends = [ - base binary bytestring hspec mtl rio text vector - ]; - description = "Parser for GHC's hi files"; - license = lib.licenses.bsd3; - }) {}; - - "hi-file-parser_0_1_6_0" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text - , vector - }: - mkDerivation { - pname = "hi-file-parser"; version = "0.1.6.0"; sha256 = "1b13lbgmdb50fw3jkbvj2wq19zmklhxam7rfn7k8bqra2z4kbp2r"; libraryHaskellDepends = [ @@ -146244,7 +146151,6 @@ self: { ]; description = "Parser for GHC's hi files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hi3status" = callPackage @@ -146399,10 +146305,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.12.0"; - sha256 = "1216vfcf6hznhb096il2hcb64wlws85l8qrcp785khny6axh1sv4"; - revision = "1"; - editedCabalFile = "18cmkzrq45schidxrn571b0x6x4vlmwkpzq0nwm97p4gsqvvwj48"; + version = "0.12.1"; + sha256 = "0iw97mkgg7nwl3dr04r3z3yxynz64agf67xasb1s7kk4gwss1f85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146425,7 +146329,7 @@ self: { mainProgram = "hie-bios"; }) {}; - "hie-bios_0_13_0" = callPackage + "hie-bios_0_13_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , co-log-core, conduit, conduit-extra, cryptohash-sha1, deepseq , directory, exceptions, extra, file-embed, filepath, ghc @@ -146435,8 +146339,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.13.0"; - sha256 = "0gv2ip6zlrfcxngv7kh1a6ah4avj6y2n406h0i66wnc9l11l9mvb"; + version = "0.13.1"; + sha256 = "1qzri41yk88x6nnizjanh0w9inbm2sq93g197il95kb74bcslf9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146466,8 +146370,8 @@ self: { }: mkDerivation { pname = "hie-compat"; - version = "0.3.1.1"; - sha256 = "0ds79wsygvv9dz8wbjxvmik58q2q9knrwrk7hy30c6qpp7a1c6jv"; + version = "0.3.1.2"; + sha256 = "0m0520z20qd3vxh047izb140jbywnhi20i9av7gf6h8f8486cs0m"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -146522,10 +146426,8 @@ self: { }: mkDerivation { pname = "hiedb"; - version = "0.4.3.0"; - sha256 = "01mypczx494hs79ma67gfvlsbpdhdmpw43bxnzdj14gph83j1730"; - revision = "1"; - editedCabalFile = "0yaxg7463625spx0dxg4znzyl8zq93mnb393wp6x11n29jd3l20r"; + version = "0.4.4.0"; + sha256 = "0pbcm00zcd33y7w5n7qp8r9r8j8jf2vdhx3l1mll1d4jfimhrsd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147101,7 +147003,7 @@ self: { mainProgram = "hindent"; }) {}; - "hindent_6_1_0" = callPackage + "hindent_6_1_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, criterion , deepseq, Diff, directory, exceptions, filepath, ghc-lib-parser , ghc-lib-parser-ex, hspec, monad-loops, mtl, optparse-applicative @@ -147110,8 +147012,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "6.1.0"; - sha256 = "03i1wxcqxllm6h55rxfksyrxvy5v21scjqa731jmchfr7xf09prr"; + version = "6.1.1"; + sha256 = "0ir524drzb11l2dqvl78hdgrzimhbnfqkg530mvg9xsyph93af3m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -150981,25 +150883,26 @@ self: { ]; }) {}; - "hnix-store-core_0_6_1_0" = callPackage + "hnix-store-core_0_7_0_0" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base - , base16-bytestring, base64-bytestring, binary, bytestring, cereal - , containers, cryptonite, directory, filepath, hashable, hspec - , lifted-base, memory, monad-control, mtl, nix-derivation, process - , relude, saltine, tasty, tasty-discover, tasty-golden, tasty-hspec - , tasty-hunit, tasty-quickcheck, temporary, text, time, unix + , base16-bytestring, base64-bytestring, binary, bytestring + , case-insensitive, cereal, containers, cryptonite, directory + , filepath, hashable, hspec, lifted-base, memory, monad-control + , mtl, nix-derivation, process, relude, saltine, tasty + , tasty-discover, tasty-golden, tasty-hspec, tasty-hunit + , tasty-quickcheck, temporary, text, time, unix , unordered-containers, vector }: mkDerivation { pname = "hnix-store-core"; - version = "0.6.1.0"; - sha256 = "1bziw2avcahqn2fpzw40s74kdw9wjvcplp6r2zrg83rbh2k1x73p"; + version = "0.7.0.0"; + sha256 = "0nyzw3ssv832bqhm4ir8r44795lnipzzkjwnryqqarc99sbpj2hh"; libraryHaskellDepends = [ algebraic-graphs attoparsec base base16-bytestring - base64-bytestring bytestring cereal containers cryptonite directory - filepath hashable lifted-base memory monad-control mtl - nix-derivation relude saltine text time unix unordered-containers - vector + base64-bytestring bytestring case-insensitive cereal containers + cryptonite directory filepath hashable lifted-base memory + monad-control mtl nix-derivation relude saltine text time unix + unordered-containers vector ]; testHaskellDepends = [ attoparsec base base16-bytestring base64-bytestring binary @@ -151211,7 +151114,7 @@ self: { license = lib.licenses.mit; }) {}; - "hoauth2_2_9_0" = callPackage + "hoauth2_2_10_0" = callPackage ({ mkDerivation, aeson, base, base64, binary, bytestring , containers, cryptonite, data-default, exceptions, hspec , hspec-discover, http-conduit, http-types, memory, microlens, text @@ -151219,8 +151122,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "2.9.0"; - sha256 = "1y8nrn4f4029imrxa215hrgv5cysdg7rcg9vwwxanavq1wfvlxfa"; + version = "2.10.0"; + sha256 = "13skl9zc3p0jnn2p10xm21kp5adqjl48nfx6v312yfvd9md5h0kq"; libraryHaskellDepends = [ aeson base base64 binary bytestring containers cryptonite data-default exceptions http-conduit http-types memory microlens @@ -151241,8 +151144,8 @@ self: { }: mkDerivation { pname = "hoauth2-demo"; - version = "1.7.0"; - sha256 = "19dnblzibmjzv01sgzbq35bx20d8yqarqyimjqqz9jmmqg368iv9"; + version = "1.8.0"; + sha256 = "12mmbklh8a3wkm7dpmighqibk1ib5z0f444pl3g8i79abaj75k7b"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -151266,8 +151169,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers"; - version = "0.3.0"; - sha256 = "0g87adfnr528vb2iy9rpc405h7x7j79fqly55d6x9i7dqhz73g7d"; + version = "0.4.0"; + sha256 = "1c29cy0317dbigwhf0rrnnm9hm3w3v10dpsilm03g4xfjmdqvzdv"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite hoauth2 HsOpenSSL http-conduit http-types jose-jwt mtl text time transformers @@ -151288,8 +151191,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers-tutorial"; - version = "0.3.0"; - sha256 = "125lkxiijc8n480m2rpzgihr4j2cywgnm67zn90l1b8fwfsgm9hv"; + version = "0.4.0"; + sha256 = "1pdnsjzx2bni1vw4w7i5d39nih5bkrybgpya568ycw52bpi8jnmn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151310,8 +151213,8 @@ self: { }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.3.0"; - sha256 = "1alnzhmgsijzv466mqbmvcalh100nqbh1pm59774q34kxxnrrjmc"; + version = "0.4.0"; + sha256 = "00nr2w8yqhmf9i4i8d7yfzwb0fwdmqcbwc37k0r9js9qxc5b1wqr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153848,36 +153751,6 @@ self: { "hpqtypes" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, HUnit, libpq, lifted-base, monad-control, mtl - , QuickCheck, random, resource-pool, scientific, semigroups - , test-framework, test-framework-hunit, text, text-show, time - , transformers, transformers-base, unordered-containers, uuid-types - , vector - }: - mkDerivation { - pname = "hpqtypes"; - version = "1.11.1.1"; - sha256 = "171j2vchl4gjfddxgqdrbzk0advk7v2jxp84jfzcrzb2pmp05dm2"; - libraryHaskellDepends = [ - aeson async base bytestring containers exceptions lifted-base - monad-control mtl resource-pool semigroups text text-show time - transformers transformers-base uuid-types vector - ]; - libraryPkgconfigDepends = [ libpq ]; - testHaskellDepends = [ - aeson base bytestring exceptions HUnit lifted-base monad-control - mtl QuickCheck random scientific test-framework - test-framework-hunit text text-show time transformers-base - unordered-containers uuid-types vector - ]; - description = "Haskell bindings to libpqtypes"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {libpq = null;}; - - "hpqtypes_1_11_1_2" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , exceptions, HUnit, libpq, lifted-base, monad-control, mtl , QuickCheck, random, resource-pool, scientific, semigroups, stm , test-framework, test-framework-hunit, text, text-show, time , transformers, transformers-base, unordered-containers, uuid-types @@ -154018,8 +153891,8 @@ self: { }: mkDerivation { pname = "hprox"; - version = "0.5.3"; - sha256 = "05z4zcskagak04mfj3grp89vjiw8vmx0ppszl1j6p201y5zmpx6n"; + version = "0.5.4"; + sha256 = "15hlf6mhm2wpgmafnr4jqqxgr83cpfp1dk48a41q3sdf2l8h4pkx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154447,30 +154320,6 @@ self: { }) {}; "hruby" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , process, QuickCheck, ruby, scientific, stm, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hruby"; - version = "0.5.0.0"; - sha256 = "10ldq23lgp3jcxpdm9b1dryjf4sprsjlc4qs1lnjb9cmfcafrqj4"; - setupHaskellDepends = [ base Cabal process ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring scientific stm text - unordered-containers vector - ]; - libraryPkgconfigDepends = [ ruby ]; - testHaskellDepends = [ - aeson attoparsec base QuickCheck text vector - ]; - description = "Embed a Ruby intepreter in your Haskell program !"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {inherit (pkgs) ruby;}; - - "hruby_0_5_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck , ruby, scientific, stm, text, unordered-containers, vector }: @@ -158829,25 +158678,6 @@ self: { }: mkDerivation { pname = "hspec-expectations-json"; - version = "1.0.2.0"; - sha256 = "0vl5brjbvjdbv2i4zq2ww7l0gg11l0ssmr4m7xqdn7as2798q1q1"; - revision = "2"; - editedCabalFile = "085mc79w056c7jinmldav7d1916y61x3p2ikb2api8symaa377n3"; - libraryHaskellDepends = [ - aeson aeson-pretty base Diff HUnit scientific text - unordered-containers vector - ]; - testHaskellDepends = [ aeson aeson-qq base hspec QuickCheck ]; - description = "Hspec expectations for JSON Values"; - license = lib.licenses.mit; - }) {}; - - "hspec-expectations-json_1_0_2_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec - , HUnit, QuickCheck, scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "hspec-expectations-json"; version = "1.0.2.1"; sha256 = "15bxyq5hdnr0pqmsj79n2q284fky9h6r8l26q8l4gjf5b5z99gj1"; libraryHaskellDepends = [ @@ -158857,7 +158687,6 @@ self: { testHaskellDepends = [ aeson aeson-qq base hspec QuickCheck ]; description = "Hspec expectations for JSON Values"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-expectations-lens" = callPackage @@ -170075,6 +169904,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.5.3"; sha256 = "0v23lawska0240vw8avxv71150y4qzbn4aj22lnkd3jxg5cnwkzh"; + revision = "1"; + editedCabalFile = "12fkswr70fw2av11yy45v189r6cb8fcg0l1r7mayvwha3gls0j3n"; libraryHaskellDepends = [ aeson base deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids text transformers unordered-containers @@ -171514,10 +171345,8 @@ self: { }: mkDerivation { pname = "invertible-grammar"; - version = "0.1.3.4"; - sha256 = "19x9bzc1cvz5zc03iglf42vyngnjkspzfd2jpl9y6pwp2sf66325"; - revision = "1"; - editedCabalFile = "059i4v6kmsrry2lw7m2ricg2ls14v4b2k554l7cmpa46g28yakyn"; + version = "0.1.3.5"; + sha256 = "01g4lf31hgv8dqabmabkp6zld6v2l3a2mv9wcgyfxghfrd6dspdw"; libraryHaskellDepends = [ base bifunctors containers mtl prettyprinter profunctors semigroups tagged template-haskell text transformers @@ -175930,25 +175759,6 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "2.0.0.9"; - sha256 = "0nj66jkql0irq5vyxhmdxxjpazr3g86x7j8klqjwxvdj5jmvy53d"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec mime-types network-uri tagsoup - text time - ]; - description = "JSON Feed"; - license = lib.licenses.mit; - }) {}; - - "json-feed_2_0_0_10" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; version = "2.0.0.10"; sha256 = "0s9fq0yp3svi8jcn2isb4kb5l71hhrahrrflciv1jzbn1kwx8lqj"; libraryHaskellDepends = [ @@ -175960,7 +175770,6 @@ self: { ]; description = "JSON Feed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "json-fu" = callPackage @@ -180905,25 +180714,12 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "2.0.0.6"; - sha256 = "0msm0qrgrnagkia8k0261p7q2ab67ml1q2nn9f951jxnhjm4mglj"; - libraryHaskellDepends = [ base servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = lib.licenses.mit; - }) {}; - - "lackey_2_0_0_7" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; version = "2.0.0.7"; sha256 = "08i4hg2m6d1s6fbgpjnd010ahgfa2d9i5m42pnnd2cr2rkan5f13"; libraryHaskellDepends = [ base servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lacroix" = callPackage @@ -181254,8 +181050,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.3.1.1"; - sha256 = "0icybndmsivnrw6wibh31g4n8bj1cclbf5cvwf816xblfmgcdhvf"; + version = "5.3.1.2"; + sha256 = "1far63mbn6w36bds8s71hxkwr8wb599r8c4w8c0q4wkw29f2dr0p"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -181281,8 +181077,8 @@ self: { }: mkDerivation { pname = "lambdabot-core"; - version = "5.3.1.1"; - sha256 = "1paya40niapvkyc8qc3k36l7qsskfdxih8d789lhd9s8rr0f9hdi"; + version = "5.3.1.2"; + sha256 = "14my72cw39hfc0i7fzhgxv5xjrdfr4pz2ccrixaclngypfd08g28"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance exceptions filepath @@ -181306,8 +181102,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.3.1.1"; - sha256 = "1fivdnj0nb4332j9m5filkpfy9wjkmsjc3kxh2w17c7irhj26f71"; + version = "5.3.1.2"; + sha256 = "0pbhwhcxn4fqvn7ynhc19285r75fiksfd9yfjz6d8iq7wmp1frp8"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -181327,8 +181123,8 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.3.1.1"; - sha256 = "1nvkkqv28dyvq7hdwz1p1yjii55vc8m6i7ccjzs9ag720cha2n4m"; + version = "5.3.1.2"; + sha256 = "00s27136i4xadm09clncrkm5annvnahrvcy04m5llrxa9ja09ixb"; libraryHaskellDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -181346,8 +181142,8 @@ self: { }: mkDerivation { pname = "lambdabot-misc-plugins"; - version = "5.3.1.1"; - sha256 = "16f9bf5c7al904iffykwp98l00j8m1f2r6qlivj03jwb6s5plm6w"; + version = "5.3.1.2"; + sha256 = "0hkia5zziwabm847bl1f2pap47iyrvjwzdsygcvywving467302d"; libraryHaskellDepends = [ base bytestring containers filepath lambdabot-core lifted-base mtl network network-uri parsec process regex-tdfa SafeSemaphore split @@ -181365,8 +181161,8 @@ self: { }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.3.1.1"; - sha256 = "1x4whzn3d4gni1xjwrjr95jqi50gwgf02x64gg9nwvkc5lh4admx"; + version = "5.3.1.2"; + sha256 = "01sas4jg54k1n68sl5v6i1lyai9chw0v0j6dl4p5rh8wdp0n5863"; libraryHaskellDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random random-fu regex-tdfa @@ -181383,8 +181179,8 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.3.1.1"; - sha256 = "1s8s4k394p59lg3xrcn0bwq9wcqzdvzx6qanmsrch0nzwg6l4g7h"; + version = "5.3.1.2"; + sha256 = "086ac4j85x2s156xzwmlldk7sll6jq3gq4mp2vjsa8w9q0p6yw0y"; libraryHaskellDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -181399,8 +181195,8 @@ self: { }: mkDerivation { pname = "lambdabot-social-plugins"; - version = "5.3.1.1"; - sha256 = "04gls4klsa7kz22k6aar636hci3iafxa5mwx8kxvgawahvlcy0p2"; + version = "5.3.1.2"; + sha256 = "137vgsr3alsmaa0dz7z55ijy2zvgy5al3wsdgmwhgkim9ahs4d2k"; libraryHaskellDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; @@ -181441,8 +181237,8 @@ self: { ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }: mkDerivation { pname = "lambdabot-trusted"; - version = "5.3.1.1"; - sha256 = "0kzkp7cy7wcig2wi2l12j8pflapsmdj45y8qq1l5j86gcvsk7xf3"; + version = "5.3.1.2"; + sha256 = "0y3c7jhihhb925x04b3ja8akgsfj2a1hyx1p8i08kaarrfmk796l"; libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ]; description = "Lambdabot trusted code"; license = "GPL"; @@ -182193,6 +181989,8 @@ self: { pname = "language-c-quote"; version = "0.13.0.1"; sha256 = "0ik16ng210fa0l93bgiwpw9m1krcw23530fvv5agl9j1b71qaxm0"; + revision = "1"; + editedCabalFile = "0skpnzjdrfadd1b835q5ic7pvl0znx1mkyxkimy99zm474rn3dzj"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -185050,19 +184848,25 @@ self: { }) {}; "leb128-binary" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, hedgehog, tasty - , tasty-bench, tasty-hedgehog, tasty-hunit + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , hedgehog, integer-logarithms, scientific, tasty, tasty-bench + , tasty-hedgehog, tasty-hunit, text }: mkDerivation { pname = "leb128-binary"; - version = "0.1.2"; - sha256 = "1bw7xk269kxd9y5983dr57nxdg8a28hbwdnzgkxn7p6z461rgpqh"; - libraryHaskellDepends = [ base binary bytestring ]; + version = "0.1.3"; + sha256 = "1rq025if04na8knv50krs4hli9ki9y26x5hg8sskikad8sffsv5j"; + libraryHaskellDepends = [ + base binary bytestring containers integer-logarithms scientific + text + ]; testHaskellDepends = [ - base binary bytestring hedgehog tasty tasty-hedgehog tasty-hunit + base binary bytestring containers hedgehog integer-logarithms + scientific tasty tasty-hedgehog tasty-hunit text ]; benchmarkHaskellDepends = [ - base binary bytestring deepseq tasty-bench + base binary bytestring containers deepseq integer-logarithms + scientific tasty-bench text ]; description = "Signed and unsigned LEB128 codec for binary library"; license = lib.licenses.asl20; @@ -186263,10 +186067,8 @@ self: { }: mkDerivation { pname = "lhs2tex"; - version = "1.24"; - sha256 = "09mkcklm9aixn4xwdcmy8z4x5myh4f5ky0nnadj1wgfjcychbmzc"; - revision = "1"; - editedCabalFile = "06vcx5i474sskqzk99l8qcxadzhz2rbmkjfyxk8aqp62pbxcq9r9"; + version = "1.25"; + sha256 = "0cf66z6mgadgqd1xs5b6gw8l9rkwgbfsc5czwdiapn7ichi26qyj"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -187182,6 +186984,18 @@ self: { license = lib.licenses.isc; }) {inherit (pkgs) libsodium;}; + "libsodium-bindings" = callPackage + ({ mkDerivation, base, libsodium }: + mkDerivation { + pname = "libsodium-bindings"; + version = "0.0.1.0"; + sha256 = "1asmcmqiahammzxk79r0afaaxn2izvfwr5hn6ddca2qyjch30lci"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ libsodium ]; + description = "FFI bindings to libsodium"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) libsodium;}; + "libssh2" = callPackage ({ mkDerivation, base, bytestring, c2hs, libssh2, network, syb , time, unix @@ -187642,10 +187456,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.10.2.4"; - sha256 = "0pdy7q508n7gvy338xsv9a8fg7saksi8qb9av6j3a37l2pp4vvcv"; - revision = "2"; - editedCabalFile = "0bg2qmg6lav4zizki1cvqpvd3wqjhfjff7zz17wg5hzlm5318gky"; + version = "0.10.2.5"; + sha256 = "1lhyjv32plqs0r2gi7ca8b527z5qas7xgjkh680lqwi0l81xd80n"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -189477,8 +189289,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.9.2.5.0"; - sha256 = "1a508khibgy94z9fk91z22wl7qqdw8l4wcfcjxk0z7z7f05llrim"; + version = "0.9.2.8.0"; + sha256 = "1n4dkahiaci6j502w5ksqpb1g7v8rwf3hbhqqprjmcc6cl5ppyzn"; setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; libraryHaskellDepends = [ base bytestring containers ghc-prim liquidhaskell-boot @@ -189501,8 +189313,8 @@ self: { }: mkDerivation { pname = "liquidhaskell-boot"; - version = "0.9.2.5.0"; - sha256 = "10k8pisygfdy23i2zb538rl7yf3gac4wxa550dsqnzkmkfcr82yz"; + version = "0.9.2.8.0"; + sha256 = "0q1rknlqi4x9gpkl9yvrzxfkbkcs6m883dhpvlymqpvsp2qs22b1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring Cabal cereal cmdargs containers @@ -192957,21 +192769,20 @@ self: { , co-log-core, containers, data-default, directory, exceptions , filepath, hashable, hspec, hspec-discover, lens, lens-aeson , lsp-types, mtl, prettyprinter, random, row-types, sorted-list - , stm, temporary, text, text-rope, transformers, unliftio-core + , stm, text, text-rope, transformers, unliftio-core , unordered-containers, uuid }: mkDerivation { pname = "lsp"; - version = "2.2.0.0"; - sha256 = "0nqxkx7vjzvn5ysalk9nd1aqwzfxjj39g3g91qr01hdzydfjsajr"; + version = "2.3.0.0"; + sha256 = "0jxvwhmfvnyp6r1kqfg13qpkd1a6a26r8z1aqhg2lj62lnz6d672"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base bytestring co-log-core containers data-default directory exceptions filepath hashable lens lens-aeson - lsp-types mtl prettyprinter random row-types sorted-list stm - temporary text text-rope transformers unliftio-core - unordered-containers uuid + lsp-types mtl prettyprinter random row-types sorted-list stm text + text-rope transformers unliftio-core unordered-containers uuid ]; testHaskellDepends = [ base containers hspec row-types sorted-list text text-rope @@ -193019,8 +192830,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.16.0.0"; - sha256 = "0a2xv9nqz84ymmbz7yyhxkrxhghafgpmma9iqz32jwr8wqn6g9hf"; + version = "0.16.0.1"; + sha256 = "0vh4x6yx7drz78ffl4p80r6ykba7fvs0wfj3dp7lhn0k8yji4zv0"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring co-log-core conduit conduit-parse containers data-default Diff directory @@ -193073,8 +192884,8 @@ self: { }: mkDerivation { pname = "lsp-types"; - version = "2.0.2.0"; - sha256 = "0s895x3b8fpcj2b0ia3d4dmwk4vhg6h2anmzffkpr3drsq5bi1j6"; + version = "2.1.0.0"; + sha256 = "0i4ygvf7fc6bh5rmw3fq7ck4vcmbfw92fzvnxpmqr3j1yp3a6fiw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195027,8 +194838,8 @@ self: { }: mkDerivation { pname = "mailtrap"; - version = "0.1.1.0"; - sha256 = "177zfswsgg8r51pzjvyf7k4dnvrfq3zj82b54xh5vdpd74k3x2ng"; + version = "0.1.2.0"; + sha256 = "0fglprc6ppq316w870p2gdbnn4kh71a0v2zjhsxrxjcbprwb537h"; libraryHaskellDepends = [ aeson base base64 blaze-html bytestring email-validate filepath http-conduit mime-types text time unordered-containers uuid-types @@ -195059,8 +194870,8 @@ self: { pname = "mainland-pretty"; version = "0.7.1"; sha256 = "19z2769rik6kwvsil2if2bfq2v59jmwv74jy3fy4q3q3zy4239p1"; - revision = "2"; - editedCabalFile = "0jinam3djr66lk21p2z7vmldk96qh0pf7rq3d56g77krdd6bd9p1"; + revision = "3"; + editedCabalFile = "0wspwmy0wi1fcyw8czgkr03iyq73gg4i0x6ckjbhxq7qb3r62q8v"; libraryHaskellDepends = [ base containers srcloc text transformers ]; @@ -196273,6 +196084,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Computations for Markov chain usage models"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "markov-processes" = callPackage @@ -197153,17 +196966,15 @@ self: { }: mkDerivation { pname = "matrix"; - version = "0.3.6.1"; - sha256 = "0b1v17rc9q7ni44gkzp124kmc5d6xmlpiqvskgjrq54qpjinr5zs"; - revision = "1"; - editedCabalFile = "0iy0gdgg68ldhgm4lzvzl5pmzflx0r4brdbdkq75rkarm7cigawn"; + version = "0.3.6.3"; + sha256 = "0gzh89nj4cqk772x37byv7z3smjpr76bd9qmqpz9bbnyicwig0qc"; libraryHaskellDepends = [ base deepseq loop primitive semigroups vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "A native implementation of matrix operations"; - license = lib.licenses.bsd3; + license = lib.licenses.mit; }) {}; "matrix-as-xyz" = callPackage @@ -203691,10 +203502,8 @@ self: { }: mkDerivation { pname = "monad-metrics"; - version = "0.2.2.0"; - sha256 = "13wsz9c02jsh5sh2kka1v7kna1aij51794n7g52ib27qmxgg9qvq"; - revision = "1"; - editedCabalFile = "1y5733zs49jyi2qyx8nk2p2ddzkkih1nw33qjrc9ppk05m3030hi"; + version = "0.2.2.1"; + sha256 = "1fknfailm2cwl8r96pxxbid3chvmaq3g98yb6l4pnr8mcqyyz7k6"; libraryHaskellDepends = [ base clock ekg-core exceptions hashable microlens mtl text transformers unordered-containers @@ -204065,8 +203874,8 @@ self: { pname = "monad-ste"; version = "0.1.0.0"; sha256 = "0yqkx7rlrfms7wiymb41y5nxh8fyi4049729iamwablx6hdpsrw6"; - revision = "2"; - editedCabalFile = "0dcdf3nifq26v63r6l1bxx4zv3ldgq7dxijf07ba9dliizwj2nr8"; + revision = "3"; + editedCabalFile = "0zr8ixjx1rsgfjnil4w74pf0m2m697z50ai7sb14ra9s78yb66b6"; libraryHaskellDepends = [ base exceptions ghc-prim primitive ]; testHaskellDepends = [ base hspec HUnit ]; description = "ST monad with efficient explicit errors"; @@ -205095,8 +204904,8 @@ self: { pname = "monoidal-containers"; version = "0.6.4.0"; sha256 = "09sg4gsrvgnsy12819sps2l0j97baanbsq2w1pvypnrkanzrw083"; - revision = "1"; - editedCabalFile = "0dav6640nvxizgqqkwqmpi9z04n2swhxmyl68xm94c9np356q5iw"; + revision = "2"; + editedCabalFile = "0k0pi43km8v25rz61zqfw958djbxrrjb1a2idkpj92klbjsr49dd"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign these unordered-containers witherable @@ -205242,8 +205051,8 @@ self: { }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.13.2"; - sha256 = "1lklf9n1ck1yyyc73f36i495rgq2anxm33ghcmlssy8allpv1k8w"; + version = "0.0.14.0"; + sha256 = "1cxj7gw732hnm7lmz5d3pwdh03gswdycjsg5c145xsgc7s09vy0c"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -205387,8 +205196,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "8"; - editedCabalFile = "0xpid9mlk56c03axbqam9yws9g47rqbdils3zpqlc6pd4mrwb030"; + revision = "9"; + editedCabalFile = "0911yfyf0z7zzpc0my8rsg2p38dz07w7mkhc3b909ydyh04wzxvp"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -208608,6 +208417,8 @@ self: { pname = "multiset"; version = "0.3.4.3"; sha256 = "1i0mjjdv8ayfars014nch5p3jlbl1wlr1bbkp7q2iknkllasxz3r"; + revision = "1"; + editedCabalFile = "0wkwvavc75q7g7gjxh7jc4cla65ys8136jf14g3ifma5vy3wafs5"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base checkers doctest QuickCheck tasty tasty-quickcheck @@ -209770,36 +209581,28 @@ self: { }) {}; "myers-diff" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq - , exceptions, primitive, QuickCheck, quickcheck-instances, random - , sandwich, sandwich-quickcheck, string-interpolate, text - , text-rope, vector, weigh + ({ mkDerivation, base, containers, criterion, deepseq, exceptions + , primitive, QuickCheck, quickcheck-instances, sandwich + , sandwich-quickcheck, string-interpolate, text, text-rope, vector + , weigh }: mkDerivation { pname = "myers-diff"; - version = "0.2.0.0"; - sha256 = "1k71p2di2vpbfjsbycclj2xhlb1q5j37z4h18yxh2m0jj1r3dw07"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.0"; + sha256 = "1zkhax2wha1cv9zzw7hvk4dnnkd8p6iskd7lf8d7kmkjv88bxjsa"; libraryHaskellDepends = [ base containers exceptions primitive text vector ]; - executableHaskellDepends = [ - base containers deepseq exceptions primitive QuickCheck - quickcheck-instances string-interpolate text text-rope vector - ]; testHaskellDepends = [ - base containers deepseq exceptions primitive QuickCheck + base containers criterion deepseq exceptions primitive QuickCheck quickcheck-instances sandwich sandwich-quickcheck string-interpolate text text-rope vector ]; benchmarkHaskellDepends = [ - array base containers criterion deepseq exceptions primitive - QuickCheck quickcheck-instances random string-interpolate text - text-rope vector weigh + base containers criterion deepseq exceptions primitive QuickCheck + quickcheck-instances string-interpolate text text-rope vector weigh ]; license = lib.licenses.bsd3; - mainProgram = "myers-diff"; }) {}; "myo" = callPackage @@ -212808,6 +212611,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "network-control" = callPackage + ({ mkDerivation, base, psqueues, unix-time }: + mkDerivation { + pname = "network-control"; + version = "0.0.1"; + sha256 = "1fhxnfc62kqnb24jj3ydl4mf43skgpjyhvirn1pjp30hnki8p8p9"; + libraryHaskellDepends = [ base psqueues unix-time ]; + description = "Library to control network protocols"; + license = lib.licenses.bsd3; + }) {}; + "network-data" = callPackage ({ mkDerivation, base, bytestring, cereal, pretty }: mkDerivation { @@ -214650,6 +214464,33 @@ self: { ]; }) {}; + "nix-derivation_1_1_3" = callPackage + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , filepath, pretty-show, QuickCheck, text, vector + }: + mkDerivation { + pname = "nix-derivation"; + version = "1.1.3"; + sha256 = "11drhg3zjhwbvdw25k0icvbkcpqilx0m9qw60k7snfaz1iadfkdb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers deepseq filepath text vector + ]; + executableHaskellDepends = [ attoparsec base pretty-show text ]; + testHaskellDepends = [ + attoparsec base filepath QuickCheck text vector + ]; + benchmarkHaskellDepends = [ attoparsec base criterion text ]; + description = "Parse and render *.drv files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "pretty-derivation"; + maintainers = [ + lib.maintainers.Gabriella439 lib.maintainers.sorki + ]; + }) {}; + "nix-diff" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , directory, filepath, generic-arbitrary, mtl, nix-derivation @@ -216012,26 +215853,6 @@ self: { }: mkDerivation { pname = "nothunks"; - version = "0.1.4"; - sha256 = "0x8km8pmdnjsafchndzxrypldxscj8h080i14hvkj2ypfkmh52l8"; - revision = "1"; - editedCabalFile = "0xv39s948j50ym1fn5h7xfxr6zl4v7h2mc68qrp4zz2mahx9mk7d"; - libraryHaskellDepends = [ - base bytestring containers ghc-heap stm text time vector - ]; - testHaskellDepends = [ - base containers ghc-prim hedgehog random stm tasty tasty-hedgehog - ]; - description = "Examine values for unexpected thunks"; - license = lib.licenses.asl20; - }) {}; - - "nothunks_0_1_5" = callPackage - ({ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim - , hedgehog, random, stm, tasty, tasty-hedgehog, text, time, vector - }: - mkDerivation { - pname = "nothunks"; version = "0.1.5"; sha256 = "1s5x4g5g62bs3jd44p2p9lvv01gwarm8jmmigm1d3i8ia8w0lz4w"; libraryHaskellDepends = [ @@ -216042,7 +215863,6 @@ self: { ]; description = "Examine values for unexpected thunks"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "notifications-tray-icon" = callPackage @@ -221172,8 +220992,8 @@ self: { pname = "optics-extra"; version = "0.4.2.1"; sha256 = "0hfa5yb7l3l310lfxkii13fjzb69g619agadc5a86i734nisf8vy"; - revision = "1"; - editedCabalFile = "0bpr1bkb7mmww028n8ikwa0qhdl7ybxpb9s887dlp3dvxr5iq8nq"; + revision = "2"; + editedCabalFile = "0w7am7pvwg4mx0nrksxgr2rvnk99nhqfpj80ig21m9xbpxsh22x4"; libraryHaskellDepends = [ array base bytestring containers hashable indexed-profunctors indexed-traversable-instances mtl optics-core text transformers @@ -221209,8 +221029,8 @@ self: { pname = "optics-th"; version = "0.4.1"; sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p"; - revision = "5"; - editedCabalFile = "0a9h1bll1m9v40cv7ifv2sy3k6sfcq325s7cpk33wh65awf5zpl7"; + revision = "6"; + editedCabalFile = "03qm6q7gw97qlcgnqp097dyvqkqpq4ph95y5ra6k6da218rbl1nk"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -221555,19 +221375,20 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; - "optparse-generic_1_5_1" = callPackage - ({ mkDerivation, base, bytestring, Only, optparse-applicative, text - , time, transformers, transformers-compat, void + "optparse-generic_1_5_2" = callPackage + ({ mkDerivation, base, bytestring, filepath, Only + , optparse-applicative, text, time, transformers + , transformers-compat, void }: mkDerivation { pname = "optparse-generic"; - version = "1.5.1"; - sha256 = "01naichbyxwssdf55r5qzd79zfvgd1i239fp3srkz5w45p90znyr"; + version = "1.5.2"; + sha256 = "0dca5q57jv4b8l1af4ywimaiw9rfrysambcghfmll4il5prm3d67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Only optparse-applicative text time transformers - transformers-compat void + base bytestring filepath Only optparse-applicative text time + transformers transformers-compat void ]; executableHaskellDepends = [ base ]; description = "Auto-generate a command-line parser for your datatype"; @@ -221862,12 +221683,16 @@ self: { }) {}; "ordering-duplicates" = callPackage - ({ mkDerivation, base, contravariant, lens, mtl }: + ({ mkDerivation, base, contravariant, lens, mtl, profunctors + , semigroupoids + }: mkDerivation { pname = "ordering-duplicates"; - version = "0.0.2"; - sha256 = "1c2d2np8dqxsbhkdjk3lzh0ninlzcbdczd0bkq1przcraswxsll5"; - libraryHaskellDepends = [ base contravariant lens mtl ]; + version = "0.1.0"; + sha256 = "0c8gxjf2ximg737ndv8jh35r9fcw4zfxb265m2w5wsg64syh9nmw"; + libraryHaskellDepends = [ + base contravariant lens mtl profunctors semigroupoids + ]; description = "Functions for detecting duplicates"; license = lib.licenses.bsd3; }) {}; @@ -223778,6 +223603,17 @@ self: { ]; }) {}; + "pandoc-builder-monadic" = callPackage + ({ mkDerivation, base, dlist, mtl, pandoc-types, text }: + mkDerivation { + pname = "pandoc-builder-monadic"; + version = "1.0.0"; + sha256 = "1ww1fwnsp4xka50jgwlaxzqzzpshglih6n0zi0cmd0bj7jn47jrf"; + libraryHaskellDepends = [ base dlist mtl pandoc-types text ]; + description = "A monadic DSL for building pandoc documents"; + license = lib.licenses.bsd3; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -224455,6 +224291,17 @@ self: { broken = true; }) {}; + "pandoc-query" = callPackage + ({ mkDerivation, base, pandoc, pandoc-types, text }: + mkDerivation { + pname = "pandoc-query"; + version = "1.0.0"; + sha256 = "071f93skzn188qb5nl010jhhh8wgaji9m54frw1ig54f7xhvmnw0"; + libraryHaskellDepends = [ base pandoc pandoc-types text ]; + description = "Pandoc filter to extract only the links"; + license = lib.licenses.gpl3Only; + }) {}; + "pandoc-select-code" = callPackage ({ mkDerivation, base, pandoc, pandoc-types }: mkDerivation { @@ -224599,6 +224446,8 @@ self: { pname = "pandoc-types"; version = "1.23.1"; sha256 = "1hd18l1c5yh7x24gsligkbraadq12hn7mim16xyjnicdsa1s03xd"; + revision = "1"; + editedCabalFile = "02yaziq3xyz9zqr4qrqm4drlqpa3xnxmm5x0ci52c5p5dr3c3b3d"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb text transformers @@ -227471,27 +227320,6 @@ self: { }: mkDerivation { pname = "patrol"; - version = "1.0.0.5"; - sha256 = "1nkni4zridr6y6q158f332kv93a828pimq6xwa6644hh4r1gxb25"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions - http-client http-types network-uri text time uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions hspec - http-client http-types network-uri text time uuid - ]; - description = "Sentry SDK"; - license = lib.licenses.mit; - }) {}; - - "patrol_1_0_0_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, exceptions, hspec, http-client, http-types - , network-uri, text, time, uuid - }: - mkDerivation { - pname = "patrol"; version = "1.0.0.6"; sha256 = "02szpfdzhb7b6gklnly45wibma19h7dbklqcrc435ks0bjncgyi7"; libraryHaskellDepends = [ @@ -227504,7 +227332,6 @@ self: { ]; description = "Sentry SDK"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "patronscraper" = callPackage @@ -230735,8 +230562,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phladiprelio-general-datatype"; - version = "0.3.1.0"; - sha256 = "1pbd6hd1pb28shag6xa08caamz6f02dn71v9asyyqznxpljf4771"; + version = "0.5.1.0"; + sha256 = "10r5wxdqi6ccym7rabha4f1d4y94b2xjih9ib4w6dilqv9f86bi7"; libraryHaskellDepends = [ base ]; description = "Extended functionality of PhLADiPreLiO"; license = lib.licenses.mit; @@ -230767,8 +230594,8 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.11.1.0"; - sha256 = "1rlnkfiacz1d73bf503wy609gfq2xh7h912rqqm1g364kj473f2c"; + version = "0.13.0.0"; + sha256 = "020r916dasx5q0ak9caj85dfzh5f1c4affryb39gm2jsf3m25d2n"; libraryHaskellDepends = [ async base cli-arguments directory halfsplit phladiprelio-general-datatype phladiprelio-general-shared @@ -230832,8 +230659,8 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.12.1.0"; - sha256 = "0k29gyjfdjy2l36i857dhd5d0jk4w33acvy7c56j4m0lmsw0azmn"; + version = "0.14.0.0"; + sha256 = "0hpn6r8817wrn2ywh2ahi5nf8b7rlczfzfvbw8b9y1b4z3r96nir"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231514,8 +231341,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.11.0.0"; - sha256 = "0rijqyvavk2i7439n25wzb4dggz9xv2hfxw7557p5jqii15jxvcs"; + version = "0.12.1.0"; + sha256 = "0aq3rsrgy8gx01zi016hn0mhszg1166ysmr3iqrq5f4ajg6kc0fm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; @@ -232566,8 +232393,8 @@ self: { pname = "pipes-bytestring"; version = "2.1.7"; sha256 = "0ch7145pv4f56601ysdj5gqqwsh5ag2zh34ydswg62fqi8z8cxvc"; - revision = "2"; - editedCabalFile = "0nvb4y5s0jrm4v5a3hvxabjlb16xdlivlh0qrqpl4fi1gih1x4yb"; + revision = "3"; + editedCabalFile = "0a5mp98prbpn5pqpab0h3xinhh9vnjqhlss44zq9dbvxw14agxak"; libraryHaskellDepends = [ base bytestring pipes pipes-group pipes-parse stringsearch transformers @@ -233363,36 +233190,16 @@ self: { }: mkDerivation { pname = "pipes-safe"; - version = "2.3.4"; - sha256 = "1ha0q1dwl52rn59shmk8jhp7grngpiwmp8x4qa9h54flvxkqk12x"; - revision = "6"; - editedCabalFile = "00zidlhj81dp9ksnilkazi9rzi8azxxyv7gwjm0nn12jii45q6i4"; - libraryHaskellDepends = [ - base containers exceptions monad-control mtl pipes primitive - transformers transformers-base - ]; - description = "Safety for the pipes ecosystem"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "pipes-safe_2_3_5" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control, mtl - , pipes, primitive, transformers, transformers-base - }: - mkDerivation { - pname = "pipes-safe"; version = "2.3.5"; sha256 = "13npagy597g6zfr2f3vj4a98h2ssg2ps7lmdzrgdsvm8m28x3cph"; - revision = "1"; - editedCabalFile = "0ddvkil91z0j0n5i1jn6xnj423y5qyi1ax3cdwzb71galfjp7adc"; + revision = "2"; + editedCabalFile = "04yyjgqr81b10635bw0f2i5kfh0qzp7l3v9k9qbzskvlsl3kdyjy"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base ]; description = "Safety for the pipes ecosystem"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; @@ -234504,10 +234311,8 @@ self: { }: mkDerivation { pname = "plots"; - version = "0.1.1.3"; - sha256 = "1gkrwigv53vg1q96z56m86xf6z9g9w4jqaapf81rixqsww7hrbng"; - revision = "1"; - editedCabalFile = "0khcgsbl837rahz9qkq8fbdz9nrdbppqaxpdimp46aha4jbhkyqd"; + version = "0.1.1.4"; + sha256 = "1b68dd1xk6kqfgyypddk4zcllm8lnfxz2a2fhvb4d09ar3ix7s40"; libraryHaskellDepends = [ adjunctions base base-orphans colour containers data-default diagrams-core diagrams-lib directory distributive filepath @@ -237648,8 +237453,8 @@ self: { }: mkDerivation { pname = "postgres-websockets"; - version = "0.11.2.1"; - sha256 = "0zlm0gk4sxm84kx205n5z0r0nw13kajk7400zbi9v2xslwjpgxnn"; + version = "0.11.2.2"; + sha256 = "0sjl0r6mg3b3qh4b3y2p1d4q1i6k456v3dj4vw9fhdi51rmyrhah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237826,6 +237631,8 @@ self: { pname = "postgresql-libpq"; version = "0.10.0.0"; sha256 = "0qnzbc1rws6kgy3g1y9n7c2mh190996jlwrp0j3hbsmgdy9aig2l"; + revision = "1"; + editedCabalFile = "1xqf1mqbsq75iay8hv4d8ac5psaay6v106w0nqv00p1y5vfay72w"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; @@ -238161,6 +237968,8 @@ self: { pname = "postgresql-simple"; version = "0.7.0.0"; sha256 = "0gm1wk2zq35h46v0l1qc0z63jv3gxgqd059j1mcmww80a6sipf4c"; + revision = "1"; + editedCabalFile = "0yhggx06wbg57psqa8sswf85qfzy8ndssv13vwmxj0gc1ca1zv4l"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers hashable Only postgresql-libpq scientific template-haskell text @@ -240288,25 +240097,6 @@ self: { }: mkDerivation { pname = "prettyprinter-combinators"; - version = "0.1.1.1"; - sha256 = "1553qii74af7a5xxj3n6ch9vv84kr5ayd1z69x0d78lqqraibx4y"; - revision = "1"; - editedCabalFile = "0dp01v9ywwzpvwbiljnlgrazh7pjz8p94wald2rvxa97xzlcm4z2"; - libraryHaskellDepends = [ - base bimap bytestring containers dlist pretty-show prettyprinter - syb template-haskell text unordered-containers vector - ]; - description = "Some useful combinators for the prettyprinter package"; - license = lib.licenses.asl20; - }) {}; - - "prettyprinter-combinators_0_1_2" = callPackage - ({ mkDerivation, base, bimap, bytestring, containers, dlist - , pretty-show, prettyprinter, syb, template-haskell, text - , unordered-containers, vector - }: - mkDerivation { - pname = "prettyprinter-combinators"; version = "0.1.2"; sha256 = "1kmvzczb9g3m2q7glrhwwaklbjs225xgq61vcp5qbysnyhdbxydi"; libraryHaskellDepends = [ @@ -240315,7 +240105,6 @@ self: { ]; description = "Some useful combinators for the prettyprinter package"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "prettyprinter-compat-annotated-wl-pprint" = callPackage @@ -243888,15 +243677,15 @@ self: { }) {}; "ptr" = callPackage - ({ mkDerivation, base, bytestring, cereal, contravariant, gauge + ({ mkDerivation, base, bytestring, cereal, contravariant, criterion , profunctors, QuickCheck, quickcheck-instances, rerebase , strict-list, tasty, tasty-hunit, tasty-quickcheck, text, time - , tostring, vector + , vector }: mkDerivation { pname = "ptr"; - version = "0.16.8.4"; - sha256 = "047f4j89mhy18p4ga0322nln61xx5bvlfiqg6aiywrm2k95gsblh"; + version = "0.16.8.5"; + sha256 = "1rpbvg74cvqdpbvnwn28jy0sb7l5hzf4bs371zyr0dwh0ls3xrg6"; libraryHaskellDepends = [ base bytestring contravariant profunctors strict-list text time vector @@ -243905,7 +243694,7 @@ self: { cereal QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; - benchmarkHaskellDepends = [ cereal gauge rerebase tostring ]; + benchmarkHaskellDepends = [ cereal criterion rerebase ]; description = "Experimental abstractions for operations on pointers"; license = lib.licenses.mit; }) {}; @@ -245835,8 +245624,8 @@ self: { pname = "quaalude"; version = "0.0.0.1"; sha256 = "0wwsrpm2s7gs2c4fwh4qvhnjywxfyf94dw715bz34q7bzyyk3lc6"; - revision = "1"; - editedCabalFile = "0mqgnxadwgz0ky3nvzqrkdnx5xb2a8qbiwvdwjmy63xhwdymy5ap"; + revision = "2"; + editedCabalFile = "1danjjnb38pnz5x4xdqas5fr9xb703i6a4jx49kq5q311v8dccva"; libraryHaskellDepends = [ base ]; description = "Extremely minimal prelude"; license = lib.licenses.asl20; @@ -246301,20 +246090,20 @@ self: { , containers, crypto-token, crypton, crypton-x509 , crypton-x509-system, data-default-class, fast-logger, filepath , hspec, hspec-discover, iproute, memory, network - , network-byte-order, network-udp, psqueues, QuickCheck, random - , stm, tls, unix-time, unliftio, unliftio-core + , network-byte-order, network-control, network-udp, QuickCheck + , random, stm, tls, unix-time, unliftio, unliftio-core }: mkDerivation { pname = "quic"; - version = "0.1.7"; - sha256 = "09pdlp49ix56cnshscq1knmakwcgwjq1p24i2rf4yyfc8hkj3bfc"; + version = "0.1.9"; + sha256 = "0xb6ibssn3r45ab48cj74m8c23ic0gszgfrlm5xaj7nmcixna5i2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base base16-bytestring bytestring containers crypto-token crypton crypton-x509 crypton-x509-system data-default-class fast-logger filepath iproute memory network network-byte-order - network-udp psqueues random stm tls unix-time unliftio + network-control network-udp random stm tls unix-time unliftio unliftio-core ]; testHaskellDepends = [ @@ -246919,6 +246708,44 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "quickcheck-state-machine_0_8_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, array, base, base-compat + , bifunctors, bytestring, containers, directory, doctest + , exceptions, filelock, filepath, generic-data, generics-sop + , graphviz, hashable, hashtables, http-client, MemoTrie + , monad-logger, mtl, network, persistent, persistent-postgresql + , persistent-sqlite, persistent-template, postgresql-simple, pretty + , pretty-show, process, QuickCheck, quickcheck-instances, random + , resource-pool, resourcet, servant, servant-client, servant-server + , sop-core, split, stm, strict, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, text, time, unliftio + , unliftio-core, vector, wai, warp + }: + mkDerivation { + pname = "quickcheck-state-machine"; + version = "0.8.0"; + sha256 = "1fiffmc4bivivdkyb28103rvcnrlc44s28gv63c27r6vkwkwava2"; + libraryHaskellDepends = [ + ansi-wl-pprint base base-compat bytestring containers directory + exceptions filepath generic-data generics-sop graphviz MemoTrie mtl + pretty pretty-show process QuickCheck random sop-core split text + time unliftio vector + ]; + testHaskellDepends = [ + aeson array base bifunctors bytestring containers directory doctest + filelock filepath hashable hashtables http-client monad-logger mtl + network persistent persistent-postgresql persistent-sqlite + persistent-template postgresql-simple pretty-show process + QuickCheck quickcheck-instances random resource-pool resourcet + servant servant-client servant-server split stm strict + string-conversions tasty tasty-hunit tasty-quickcheck text unliftio + unliftio-core vector wai warp + ]; + description = "Test monadic programs using state machine based models"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-state-machine-distributed" = callPackage ({ mkDerivation, base, binary, containers, directory , distributed-process, mtl, network-transport @@ -248247,25 +248074,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "rampart"; - version = "2.0.0.6"; - sha256 = "0znh7v4s7mljlkhk4xpgkps8irbnqh8q2hrb1niwjxnl9mvchpjg"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Determine how intervals relate to each other"; - license = lib.licenses.mit; - }) {}; - - "rampart_2_0_0_7" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "rampart"; version = "2.0.0.7"; sha256 = "03yvjnyij98c1lmak3511zn1rfczwnjaal0vrqq3lq5j89ysvyrf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Determine how intervals relate to each other"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ramus" = callPackage @@ -248429,8 +248243,8 @@ self: { }: mkDerivation { pname = "random-cycle"; - version = "0.1.1.0"; - sha256 = "10rpgga4kf7ls5a6yphhcqwdprhzl8im81712p7k9wf9iciw96g7"; + version = "0.1.2.0"; + sha256 = "0lq5k43ifhknb1nnq4hhsyjh5qlmgcplvsdsxzsmmrk185pmfc9x"; libraryHaskellDepends = [ base mwc-random primitive random vector ]; @@ -248739,8 +248553,8 @@ self: { pname = "range-set-list"; version = "0.1.3.1"; sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j"; - revision = "5"; - editedCabalFile = "17a016lbs5p94bclgzqkyld4vhp4rnv4rg8xk4qhqyagggrvq9k7"; + revision = "6"; + editedCabalFile = "0gxcsav13k7cm0h45a5xqwd2jqk307cl4vh0d1bqvwsmn014z5w4"; libraryHaskellDepends = [ base containers deepseq hashable ]; testHaskellDepends = [ base containers deepseq hashable tasty tasty-quickcheck @@ -249195,27 +249009,6 @@ self: { }: mkDerivation { pname = "ratel"; - version = "2.0.0.9"; - sha256 = "06zvz041ylpxmipydq1g3lli1w61dbq8dnmqgy2iga8jhd7dif48"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers filepath hspec - http-client http-client-tls http-types uuid - ]; - description = "Notify Honeybadger about exceptions"; - license = lib.licenses.mit; - }) {}; - - "ratel_2_0_0_10" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, uuid - }: - mkDerivation { - pname = "ratel"; version = "2.0.0.10"; sha256 = "1vvz9ia5p7phkwryjfwrzfzvrb94r127vy56qkgikwc9jxxdlxlj"; libraryHaskellDepends = [ @@ -249228,7 +249021,6 @@ self: { ]; description = "Notify Honeybadger about exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratel-wai" = callPackage @@ -249237,21 +249029,6 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "2.0.0.4"; - sha256 = "1y5dam4vpisi409d5mnzqj8a1x1nv2aaj0ynq6wavzqw306gwbnz"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = lib.licenses.mit; - }) {}; - - "ratel-wai_2_0_0_5" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; version = "2.0.0.5"; sha256 = "1y2rcp1birh1akw98zw10qwjwi5wf7qknk7j5xwwjws7hpmmgy2y"; libraryHaskellDepends = [ @@ -249259,7 +249036,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratelimiter" = callPackage @@ -257079,8 +256855,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "1.0"; - sha256 = "0xyiiqlx516v78s240r740xdcmj678np8j16a1kg1f3xpxj7m6lp"; + version = "1.1"; + sha256 = "09pz2q9bw5c6qlfsy83piryjnzhq3zra1mly3ypqlr9d36zj7bfb"; libraryHaskellDepends = [ base containers deepseq dunai free monad-schedule MonadRandom random simple-affine-space time time-domain transformers @@ -257102,15 +256878,15 @@ self: { }: mkDerivation { pname = "rhine-bayes"; - version = "1.0"; - sha256 = "0g4y9i15mybi7md221a2mbw1dvilf469a2mcnvy5vd0bsx6xfw1y"; + version = "1.1"; + sha256 = "1ybzvbpdz23l3fy1dvv7kn1cpis9c9jy00zxvvwbr47pbvdi9wxc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai log-domain monad-bayes rhine transformers ]; executableHaskellDepends = [ - base log-domain mmorph monad-bayes rhine rhine-gloss time + base dunai log-domain mmorph monad-bayes rhine rhine-gloss time transformers ]; description = "monad-bayes backend for Rhine"; @@ -257125,8 +256901,8 @@ self: { }: mkDerivation { pname = "rhine-gloss"; - version = "1.0"; - sha256 = "0kx1dqf1rz91im818dn9wvf7nlq8ic0vs5m17xhx349p4yjnk8fi"; + version = "1.1"; + sha256 = "12h501lcfskygn1pf407pksh9izcb79g48j4gw63pw4islhcxdbr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -257146,8 +256922,8 @@ self: { }: mkDerivation { pname = "rhine-terminal"; - version = "1.0"; - sha256 = "1i00vapdiqgsivwzpnb055iwxxx6626842jyr9w1ccrhib86y00y"; + version = "1.1"; + sha256 = "12r7j9mnswbb59mankl8pil7xk9s9ymzxdc73vmi6ads6kf6qvyr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259152,22 +258928,19 @@ self: { "rounded-hw" = callPackage ({ mkDerivation, array, base, Cabal, deepseq, doctest, fp-ieee - , hspec, long-double, primitive, QuickCheck, random, tagged - , tasty-bench, vector + , hspec, primitive, QuickCheck, random, tagged, tasty-bench, vector }: mkDerivation { pname = "rounded-hw"; - version = "0.3.0"; - sha256 = "15y6yz101mnfkc2ff4w6wnqc5r6ykipd7jh0pbg9rjm67jmyr4b5"; - revision = "1"; - editedCabalFile = "139hr8a1qyfkdcpxn9pwmi9c7v4q3g86bjrx654nc0q7v87q4afh"; + version = "0.4.0"; + sha256 = "1844qb2nsv25ix41jkrcr0n08wa4zsnrn7wpxxavnabi4j7mf8yz"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - array base deepseq fp-ieee long-double primitive tagged vector + array base deepseq fp-ieee primitive tagged vector ]; testHaskellDepends = [ - array base deepseq doctest fp-ieee hspec long-double primitive - QuickCheck random vector + array base deepseq doctest fp-ieee hspec primitive QuickCheck + random vector ]; benchmarkHaskellDepends = [ array base deepseq fp-ieee primitive tasty-bench vector @@ -261390,25 +261163,12 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; - version = "2.0.0.3"; - sha256 = "027gyrcnyly8wd2znv6gd3ch1r0xq0ycs36lzw1yssiirl4ji5ls"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Semantic version numbers and constraints"; - license = lib.licenses.mit; - }) {}; - - "salve_2_0_0_4" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "salve"; version = "2.0.0.4"; sha256 = "1csk70mgawp7298x787xk4sshh7xm71vrc703vjwy3mv3i0sg94x"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "salvia" = callPackage @@ -261739,6 +261499,51 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich_0_2_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, deepseq, directory, exceptions + , filepath, free, haskell-src-exts, lifted-async, microlens + , microlens-th, monad-control, monad-logger, mtl + , optparse-applicative, pretty-show, process, safe, safe-exceptions + , stm, string-interpolate, template-haskell, text, time + , transformers, transformers-base, unix, unliftio-core, vector, vty + , vty-crossplatform + }: + mkDerivation { + pname = "sandwich"; + version = "0.2.0.0"; + sha256 = "18hr0xyisf9zlfcji63s086mfxgzmhxmpcfhxz41miwlg0780g6f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty vty-crossplatform + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty vty-crossplatform + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty vty-crossplatform + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sandwich-hedgehog" = callPackage ({ mkDerivation, base, free, hedgehog, monad-control, mtl , safe-exceptions, sandwich, string-interpolate, text, time, vty @@ -262239,8 +262044,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.2.3.0"; - sha256 = "0swwjp1lkfwv4g92d0f4mb6iza56fpf35af2a5kwhxvjg6kp6w32"; + version = "1.2.3.1"; + sha256 = "0w4skxbvbmvda2jrvbnnaikka529k5g6qixzc2kz3sqvq784qmks"; libraryHaskellDepends = [ base bytestring containers exceptions prettyprinter template-haskell text th-abstraction @@ -262340,6 +262145,8 @@ self: { pname = "sbv"; version = "7.13"; sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; + revision = "1"; + editedCabalFile = "0gn00bgvy9v4wiica7psrzmxbbp0fiiknrxmdy55z9k2ycpvw7la"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath @@ -262369,6 +262176,8 @@ self: { pname = "sbv"; version = "10.2"; sha256 = "1qairjjffy3di61gdav8p1h3zdz4967g13z64xahhd4f2agmr0kz"; + revision = "1"; + editedCabalFile = "0vhjrgp4mggvky170m5y3jxcss3byjdbmk3y08bfivb2id94a724"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -265787,6 +265596,8 @@ self: { pname = "sensei"; version = "0.8.0"; sha256 = "0qmi9qzfbsx9xxkczwjx1pzwmkwpl1dq1c80f4nmjgqh4mm21aw5"; + revision = "1"; + editedCabalFile = "1vafgazhxamvwp1ihjhyn2q6v8y57a6hzjvahd10bxdb1ng3mlbx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -265805,7 +265616,9 @@ self: { description = "Automatically run Hspec tests on file modifications"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.libjared ]; + broken = true; }) {}; "sensenet" = callPackage @@ -266322,10 +266135,8 @@ self: { }: mkDerivation { pname = "serialise"; - version = "0.2.6.0"; - sha256 = "05m5h5vfjp4wvh6y7j2f3d4c3l6gxww2n1v38vqrjacpw641izwk"; - revision = "3"; - editedCabalFile = "1j94b6ry6m86qi9fi4mxwf8qbfai8mv8cwgjw725hbjmmvham97b"; + version = "0.2.6.1"; + sha256 = "1x3p9vi6daf50xgv5xxjnclqcq9ynqg1qw7af3ppa1nizycrg533"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -270433,7 +270244,9 @@ self: { executableToolDepends = [ alex happy ]; description = "Treating files as sets to perform rapid set manipulation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "setdown"; + broken = true; }) {}; "setenv" = callPackage @@ -270630,8 +270443,8 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "2.3.4.1"; - sha256 = "17nyfzz4i74bhd11rbwkzk0inlx4kwqjd2h8hlk3kx5lfj20bspl"; + version = "2.3.4.2"; + sha256 = "1pbiccdddnniainx48c9s1l9fjsqf4i57iddrww12mnhdpszr3nw"; libraryHaskellDepends = [ array base bytestring containers data-fix deepseq invertible-grammar prettyprinter recursion-schemes scientific @@ -284658,8 +284471,8 @@ self: { pname = "step-function"; version = "0.2.0.1"; sha256 = "0hpzbjgjgsrx6q7sjk2dz40i2lggx8wraqlf58ibbv3y1yvb2q6a"; - revision = "1"; - editedCabalFile = "1zyv6hvh510cgvlj22wxdzs11w508gr35409wrls402g0j75c9d4"; + revision = "2"; + editedCabalFile = "034mk1k23qs8d9y1iyxnpxn0zcq0yy6z7jy9lp3l4vin6gmpz0vk"; libraryHaskellDepends = [ base containers deepseq QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; description = "Staircase functions or piecewise constant functions"; @@ -284755,12 +284568,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "stm_2_5_2_1" = callPackage + "stm_2_5_3_0" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.5.2.1"; - sha256 = "16xis3rj5i0qlr1nc8ybmcrjhhqc2mh4l4lblmi04k2x00aycas1"; + version = "2.5.3.0"; + sha256 = "1xy3sj69wcb92fg0y5lp0qxcsi3pyvvrrrn4fpi2snji4j3k47hv"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = lib.licenses.bsd3; @@ -285875,8 +285688,8 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.3.1"; - sha256 = "0ph6s8a1r0k9zhffmj23plzjlpipy4sr662dd0ya5igb9fbp5i32"; + version = "0.3.2"; + sha256 = "0rxsxm0an21d2wrngg61vdz7lqcigi7fs96n8003yfcnah63qnw8"; libraryHaskellDepends = [ base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet streaming transformers transformers-base @@ -286860,27 +286673,12 @@ self: { }: mkDerivation { pname = "strict-list"; - version = "0.1.7.2"; - sha256 = "1zzrhpgwv4cjjp601fklhv9i1hp4rpabjyylnjwbv757bv8dmlvx"; - libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; - testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; - description = "Strict linked list"; - license = lib.licenses.mit; - }) {}; - - "strict-list_0_1_7_3" = callPackage - ({ mkDerivation, base, deepseq, hashable, rerebase, semigroupoids - , tasty, tasty-quickcheck - }: - mkDerivation { - pname = "strict-list"; - version = "0.1.7.3"; - sha256 = "0bpsnhhg69dq2m9zbzchzzvgpnr0f0jgzsakcn3yzwld8dckxq67"; + version = "0.1.7.4"; + sha256 = "0jncppjyzg64d5qxban713z9mxzdky9zlldnnw029l7d1y3yv3x1"; libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; description = "Strict linked list"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strict-mvar" = callPackage @@ -287735,23 +287533,6 @@ self: { }: mkDerivation { pname = "strive"; - version = "6.0.0.9"; - sha256 = "0zd3c303vyl61alw2bl217znm72ajpsy33qjz2pf52azsdk96qfc"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - description = "A client for the Strava V3 API"; - license = lib.licenses.mit; - }) {}; - - "strive_6_0_0_10" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, template-haskell, text - , time, transformers - }: - mkDerivation { - pname = "strive"; version = "6.0.0.10"; sha256 = "10028krfmrq8v1k00ihdzp5hl6nrq0vdp3kb9xfgsyqgvv8l2ic2"; libraryHaskellDepends = [ @@ -287760,7 +287541,6 @@ self: { ]; description = "A client for the Strava V3 API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strong-path" = callPackage @@ -288209,6 +287989,8 @@ self: { pname = "stylish-haskell"; version = "0.14.5.0"; sha256 = "07f0cn7xy8yg1rm0yvkjx27xqv9xc3n1c5s4fqq3yrqyi5szdhbw"; + revision = "1"; + editedCabalFile = "0q4k40ys5k2grmbzk14sqnqw9bpq59cq9b7z41cdmbdpdvgbpcsc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -292229,24 +292011,21 @@ self: { }) {}; "table-layout" = callPackage - ({ mkDerivation, base, data-default-class - , data-default-instances-base, hspec, HUnit, QuickCheck + ({ mkDerivation, base, data-default-class, doclayout, hspec, HUnit + , QuickCheck, text }: mkDerivation { pname = "table-layout"; - version = "0.9.1.0"; - sha256 = "0jg6hr835r8m7vn92a01y754ssby3qkkai8sr42bwjvqn7zy7xl8"; + version = "1.0.0.0"; + sha256 = "0divq2wf8hpygbrsvp8x4pcbajrbmrr2i4vfjqajwjq914swb2kc"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base data-default-class data-default-instances-base - ]; + libraryHaskellDepends = [ base data-default-class doclayout text ]; executableHaskellDepends = [ - base data-default-class data-default-instances-base + base data-default-class doclayout text ]; testHaskellDepends = [ - base data-default-class data-default-instances-base hspec HUnit - QuickCheck + base data-default-class doclayout hspec HUnit QuickCheck text ]; description = "Format tabular data as grid or table"; license = lib.licenses.bsd3; @@ -292910,8 +292689,8 @@ self: { }: mkDerivation { pname = "tagtree"; - version = "0.1.0.0"; - sha256 = "1gmfw1znz4n6a08fpi0g4jkkz1m03yl59v1yj1w6kmlvyzf6dw1z"; + version = "0.1.0.1"; + sha256 = "0i9mnlfkxmsvdb33pg8qc3wvlmsdgz4hn9lzwl8ib47qj056fmvd"; libraryHaskellDepends = [ aeson base bytestring containers data-default filepattern megaparsec parser-combinators relude text @@ -295737,10 +295516,8 @@ self: { }: mkDerivation { pname = "template-haskell-optics"; - version = "0.2"; - sha256 = "13jjycd2yirslab7j6gd1hfl9bn5srid4b2apdz36janxx8np4mm"; - revision = "1"; - editedCabalFile = "1asqpnrkwqgvjyc70hicfdjrf90d5h4yh9n2fljsmkjvay3w46r6"; + version = "0.3"; + sha256 = "1gz10y1s25fpixcl315q6gqv0687aj1mw4kk8ychsg44nlqm8agz"; libraryHaskellDepends = [ base containers optics-core template-haskell th-abstraction ]; @@ -296483,14 +296260,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "termbox_2_0_0" = callPackage + "termbox_2_0_0_1" = callPackage ({ mkDerivation, base, termbox-bindings-hs }: mkDerivation { pname = "termbox"; - version = "2.0.0"; - sha256 = "0al0989wkvkm95m3dz78yrv33zgjb89vskwwq9vgnivvnq8iffhs"; - revision = "1"; - editedCabalFile = "0xwap18cxy0w48jhi1mfk15fhihfrjr2wmq1swzqnpmr6b3mpszr"; + version = "2.0.0.1"; + sha256 = "0kynby25arx6hcq64cklw9qhw87qxy6vrz9z40d7k7j817gkzccq"; libraryHaskellDepends = [ base termbox-bindings-hs ]; description = "termbox"; license = lib.licenses.bsd3; @@ -296548,10 +296323,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "termbox-bindings-c"; - version = "0.1.0"; - sha256 = "1q7frripz88zgcfmx2lab2vrj19gywnskng07zf7icsj9j6bdwyw"; - revision = "2"; - editedCabalFile = "04hnf96p6n9fxczk2hbp53kl3gm06f8zx469nvzl48qjvcxhxc2i"; + version = "0.1.0.1"; + sha256 = "1rq695y6491f0nydgm64r6v2l8mkpvzgcrb2gxfdy6g0bwarimxw"; libraryHaskellDepends = [ base ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -296561,21 +296334,19 @@ self: { ({ mkDerivation, base, termbox-bindings-c }: mkDerivation { pname = "termbox-bindings-hs"; - version = "0.1.0"; - sha256 = "07m6lp997skqp04a430ynsrzdpwcczblxawvlcbizffsznkmnl64"; - revision = "2"; - editedCabalFile = "0bpz5drzp1gfncbpsc9jjz6qyvjjn4c9w16ci79nj60zi7b5q9b5"; + version = "0.1.1"; + sha256 = "1f50j6z72g5lsdvakxvlsg77iqspcm2qmwyc1csafgs1zn40ks2i"; libraryHaskellDepends = [ base termbox-bindings-c ]; description = "termbox bindings"; license = lib.licenses.bsd3; }) {}; - "termbox-bindings-hs_0_1_1" = callPackage + "termbox-bindings-hs_1_0_0" = callPackage ({ mkDerivation, base, termbox-bindings-c }: mkDerivation { pname = "termbox-bindings-hs"; - version = "0.1.1"; - sha256 = "1f50j6z72g5lsdvakxvlsg77iqspcm2qmwyc1csafgs1zn40ks2i"; + version = "1.0.0"; + sha256 = "1j90pjqrngyygwwwk9zh2ah4sfdz9sv6222k21lmrql60md85g8i"; libraryHaskellDepends = [ base termbox-bindings-c ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -297944,8 +297715,8 @@ self: { }: mkDerivation { pname = "text-builder-linear"; - version = "0.1.1.1"; - sha256 = "0yrl0qr8zyfgrn4h618lkk5jv68ij0kzn39bgv3pi05v9dj8rnzm"; + version = "0.1.2"; + sha256 = "0ymx978kxqjcgrza82l29g8hp5qwx0miscmkwd04qcvq3iz8ikxa"; libraryHaskellDepends = [ base bytestring quote-quot text ]; testHaskellDepends = [ base tasty tasty-quickcheck text ]; benchmarkHaskellDepends = [ @@ -300355,8 +300126,8 @@ self: { pname = "threepenny-gui"; version = "0.9.4.0"; sha256 = "08jqa01pp6b300ic0xcn687i0a0kvz76bgym3dchk9n75m6hvc4f"; - revision = "3"; - editedCabalFile = "0vciaszq8kmcdxzhjy7l7w4mmhkvq9pnkyrz9i1ixxg4l2riw4f5"; + revision = "4"; + editedCabalFile = "11yn9z3n3czfpbhqfjbixcry1zj5p8m3jg2dbx5vcwx5ffklkcav"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -300612,6 +300383,8 @@ self: { ]; description = "A faster time library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tianbar" = callPackage @@ -307137,8 +306910,8 @@ self: { pname = "turtle"; version = "1.6.2"; sha256 = "0bav7b2ghbwdhpa4b5a7812psr6hqk7wydvgxjy5dsb62nqnc08s"; - revision = "1"; - editedCabalFile = "0bgd9mf1z96iqwv2cdc0pj4dy3dnfxj8qsbvjm26h54cvazc2sbl"; + revision = "2"; + editedCabalFile = "14jnb2vyq0nx4cp4c97xflzg7z9xw1avg2d27c1d1cnqg28pd4an"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -309318,8 +309091,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.10.1.1"; - sha256 = "11116iqgdpqpmzj0rjqg7bmfyg3zgvwp2ndh4q8m7cy9gcwab734"; + version = "0.10.1.2"; + sha256 = "0gn9i4p8idvl3av06il1j14x8dp9lxmb2cpdzqkwp4gsss9hfl73"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -309529,6 +309302,18 @@ self: { license = lib.licenses.mit; }) {}; + "typst-symbols_0_1_5" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "typst-symbols"; + version = "0.1.5"; + sha256 = "1kgw8c0p3qj1an6dhfim310aydgzq05lx086mznbfs5saya1x590"; + libraryHaskellDepends = [ base text ]; + description = "Symbol and emoji lookup for typst language"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tyro" = callPackage ({ mkDerivation, aeson, base, bytestring, HUnit, protolude , reflection, singletons, test-framework, test-framework-hunit @@ -316087,22 +315872,6 @@ self: { }: mkDerivation { pname = "vector-extras"; - version = "0.2.8"; - sha256 = "1xnz733p9p66693hb31fmq2cfsy2rwyw1b0915p7y5my1d8dxyzi"; - libraryHaskellDepends = [ - base containers deferred-folds foldl hashable unordered-containers - vector - ]; - description = "Utilities for the \"vector\" library"; - license = lib.licenses.mit; - }) {}; - - "vector-extras_0_2_8_1" = callPackage - ({ mkDerivation, base, containers, deferred-folds, foldl, hashable - , unordered-containers, vector - }: - mkDerivation { - pname = "vector-extras"; version = "0.2.8.1"; sha256 = "0bnjh4c001v6ia6ac40i508jdzfdlccp8v0fhy7ayv4scrvpwip2"; libraryHaskellDepends = [ @@ -316111,7 +315880,6 @@ self: { ]; description = "Utilities for the \"vector\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "vector-fft" = callPackage @@ -316841,6 +316609,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "vertexenum" = callPackage + ({ mkDerivation, base, containers, hmatrix-glpk, tasty, tasty-hunit + , vector-space + }: + mkDerivation { + pname = "vertexenum"; + version = "0.1.0.0"; + sha256 = "0gqc207lns1by4dz57wrdx3r8jnrl1clwpfi65afgi7x09ircxvw"; + libraryHaskellDepends = [ + base containers hmatrix-glpk vector-space + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Vertex enumeration"; + license = lib.licenses.gpl3Only; + }) {}; + "vessel" = callPackage ({ mkDerivation, aeson, aeson-gadt-th, base, base-orphans , bifunctors, commutative-semigroups, constraints @@ -317977,17 +317761,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "vty_6_0" = callPackage + "vty_6_1" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring, deepseq , directory, filepath, microlens, microlens-mtl, microlens-th, mtl , parsec, stm, text, utf8-string, vector }: mkDerivation { pname = "vty"; - version = "6.0"; - sha256 = "0gc57ixmkdkbffzlbj1dda183gwwb6nwz65zsl2jplqwa6airb07"; + version = "6.1"; + sha256 = "1mkv9ywqgh4z94sh8dhglklnpa53mkk39qjncjfcwszi15ylpiig"; revision = "1"; - editedCabalFile = "0r0l1qb97jdd5ygqw5zzvcji2qgzj7mqapn44zi211z3svzy8kiw"; + editedCabalFile = "1wy4vfyr4nbb8ycfx80yrp59ggigcbfrsh5w1qk768y04d114kaj"; libraryHaskellDepends = [ base binary blaze-builder bytestring deepseq directory filepath microlens microlens-mtl microlens-th mtl parsec stm text @@ -318002,8 +317786,8 @@ self: { ({ mkDerivation, base, vty, vty-unix }: mkDerivation { pname = "vty-crossplatform"; - version = "0.2.0.0"; - sha256 = "04ri60dp4gx6ycqhbdz5jd8mcwbwivwqh7fgg2m5vws6kycjma1l"; + version = "0.4.0.0"; + sha256 = "06iwxgqrqzz05hmic7z5hxd48x0i49sk935vm0xfi0xq28sl7r9m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base vty vty-unix ]; @@ -318094,8 +317878,8 @@ self: { }: mkDerivation { pname = "vty-unix"; - version = "0.1.0.0"; - sha256 = "158j7hw0ddbvhxrhn3k2ifc2wsw70dq7pj0qwnmh5bkd1fs0iakz"; + version = "0.2.0.0"; + sha256 = "1hfxc7qw884vlq8qshhyndl3zs10jc2xr6i69vhasjywkvh6gay2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -318119,8 +317903,8 @@ self: { }: mkDerivation { pname = "vty-windows"; - version = "0.1.0.3"; - sha256 = "01fwq0mpyxk5nlxkv24bzsr4klg2fpfy8rs124pdssh657aqxaf7"; + version = "0.2.0.0"; + sha256 = "03dha87c7nrfyfscnz5bjys9v971xiw4xs60d5z218daazd2rhfy"; libraryHaskellDepends = [ base blaze-builder bytestring containers deepseq directory filepath microlens microlens-mtl microlens-th mtl parsec stm transformers @@ -321672,28 +321456,30 @@ self: { "webauthn" = callPackage ({ mkDerivation, aeson, asn1-encoding, asn1-parse, asn1-types, base , base16-bytestring, base64-bytestring, binary, bytestring, cborg - , containers, cryptonite, directory, file-embed, filepath, hashable - , hourglass, hspec, hspec-expectations-json, jose, lens, memory - , monad-time, mtl, pem, QuickCheck, quickcheck-instances, serialise - , singletons, text, these, time, unordered-containers, uuid - , validation, x509, x509-store, x509-validation + , containers, crypton, crypton-x509, crypton-x509-store + , crypton-x509-validation, directory, file-embed, filepath + , hashable, hourglass, hspec, hspec-expectations-json, jose, lens + , memory, monad-time, mtl, pem, QuickCheck, quickcheck-instances + , serialise, singletons, text, these, time, unordered-containers + , uuid, validation }: mkDerivation { pname = "webauthn"; - version = "0.8.0.0"; - sha256 = "1qsywsshgj270zpzw5x5ljdmfy7v8vb8fmdqap118g4sci3ir3b8"; + version = "0.9.0.0"; + sha256 = "0rjd4hwap4vhbp7isfb2spyp1kc062x7q9vd5jfdfrvcqmgklav5"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring - base64-bytestring binary bytestring cborg containers cryptonite - file-embed hashable hourglass jose lens memory monad-time mtl - serialise singletons text these time unordered-containers uuid - validation x509 x509-store x509-validation + base64-bytestring binary bytestring cborg containers crypton + crypton-x509 crypton-x509-store crypton-x509-validation file-embed + hashable hourglass jose lens memory monad-time mtl serialise + singletons text these time unordered-containers uuid validation ]; testHaskellDepends = [ - aeson asn1-encoding base bytestring containers cryptonite directory - filepath hourglass hspec hspec-expectations-json memory mtl pem - QuickCheck quickcheck-instances serialise singletons text these - unordered-containers uuid validation x509 x509-store + aeson asn1-encoding base bytestring containers crypton crypton-x509 + crypton-x509-store directory filepath hourglass hspec + hspec-expectations-json memory mtl pem QuickCheck + quickcheck-instances serialise singletons text these + unordered-containers uuid validation ]; description = "Relying party (server) implementation of the WebAuthn 2 specification"; license = lib.licenses.asl20; @@ -321837,6 +321623,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "webdriver_0_12_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , base64-bytestring, bytestring, call-stack, data-default-class + , directory, directory-tree, exceptions, filepath, http-client + , http-types, lifted-base, monad-control, network, network-uri + , scientific, temporary, text, time, transformers + , transformers-base, unordered-containers, vector, zip-archive + }: + mkDerivation { + pname = "webdriver"; + version = "0.12.0.0"; + sha256 = "1z54i2ddcnrrfwgyy8bb3jqb279ssmwkyx69nc2zml0195ss5254"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base base64-bytestring bytestring + call-stack data-default-class directory directory-tree exceptions + filepath http-client http-types lifted-base monad-control network + network-uri scientific temporary text time transformers + transformers-base unordered-containers vector zip-archive + ]; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "webdriver-angular" = callPackage ({ mkDerivation, aeson, base, hspec, hspec-webdriver , language-javascript, template-haskell, text, transformers @@ -323345,8 +323155,8 @@ self: { pname = "windns"; version = "0.1.0.1"; sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8"; - revision = "6"; - editedCabalFile = "1hhp85x1k2fxya4j3anqpkz4xnxzdi04l5ld2jqyqb9d5abasy7f"; + revision = "7"; + editedCabalFile = "0qbgpy1h3gbhlqs0in014xg9h8mrx7rw6jdkfn81ahycy3xf4l7w"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library"; @@ -323562,25 +323372,6 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.2.0.2"; - sha256 = "015raibb13dzsjxpf5m6v9mljhcacix4ic2ypjv1cq8zfwf7wks1"; - libraryHaskellDepends = [ - base bytestring containers tagged template-haskell text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit tagged text time transformers - ]; - description = "Convert values from one type into another"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "witch_1_2_0_3" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tagged - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "witch"; version = "1.2.0.3"; sha256 = "1c5kmxb9y7i1amjb0qn1w4rx7c80f52z976d7id644v9sxp00kfx"; libraryHaskellDepends = [ @@ -323591,7 +323382,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -323918,8 +323708,8 @@ self: { pname = "wl-pprint-text"; version = "1.2.0.2"; sha256 = "0axivwh7bxmljxpfnccs66knxzrqck07byxmp2j737xbb26pf5cj"; - revision = "1"; - editedCabalFile = "030lk3dxn9ry0si5zd7lh1pww1i1nx670i1h3z8y4wwiil97pni1"; + revision = "2"; + editedCabalFile = "1zp64js72l8kkqn47hkl6rcangz14njfrhgdhq0w5x4nhvfi77md"; libraryHaskellDepends = [ base base-compat text ]; description = "A Wadler/Leijen Pretty Printer for Text values"; license = lib.licenses.bsd3; @@ -327448,8 +327238,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.47.1"; - sha256 = "1l4vpa35nqljsn4kxg5nhwj2d5ns01zj8iikrxr6f8icdirgx4pz"; + version = "0.47.2"; + sha256 = "03ln2c59v4aj5936c71zbjn075sia9x5nd7cwy60n92bn3n6wkk9"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -330102,28 +329892,6 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.7.1.2"; - sha256 = "1v2rcasjlh4wkqcas652wvs7z8n38cda4yzp18s07f01z0r8ra0r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring cryptonite errors hoauth2 http-client - http-conduit http-types memory microlens mtl safe-exceptions text - transformers unliftio uri-bytestring yesod-auth yesod-core - ]; - testHaskellDepends = [ base hspec uri-bytestring ]; - description = "OAuth 2.0 authentication plugins"; - license = lib.licenses.mit; - }) {}; - - "yesod-auth-oauth2_0_7_1_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, cryptonite, errors - , hoauth2, hspec, http-client, http-conduit, http-types, memory - , microlens, mtl, safe-exceptions, text, transformers, unliftio - , uri-bytestring, yesod-auth, yesod-core - }: - mkDerivation { - pname = "yesod-auth-oauth2"; version = "0.7.1.3"; sha256 = "151is1lvhnl3pvp0q4sn3i26l4n936vlpky3hndsn1f76cjy489b"; isLibrary = true; @@ -330136,7 +329904,6 @@ self: { testHaskellDepends = [ base hspec uri-bytestring ]; description = "OAuth 2.0 authentication plugins"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-auth-oidc" = callPackage diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 9007ab12d7547..348d054a6c773 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -20,7 +20,7 @@ } @ args: let - inherit (lib) getVersion versionAtLeast optional; + inherit (lib) getVersion versionAtLeast optional concatStringsSep; in assert versionAtLeast (getVersion erlang) minimumOTPVersion; @@ -36,7 +36,12 @@ stdenv.mkDerivation ({ LANG = "C.UTF-8"; LC_TYPE = "C.UTF-8"; - buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info"; + ERLC_OPTS = + let + erlc_opts = [ "deterministic" ] + ++ optional debugInfo "debug_info"; + in + "[${concatStringsSep "," erlc_opts}]"; preBuild = '' patchShebangs ${escriptPath} || true diff --git a/pkgs/development/interpreters/gauche/boot.nix b/pkgs/development/interpreters/gauche/boot.nix index 7fbc66406e677..61c67b13f78fa 100644 --- a/pkgs/development/interpreters/gauche/boot.nix +++ b/pkgs/development/interpreters/gauche/boot.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gauche-bootstrap"; - version = "0.9.9"; + version = "0.9.12"; src = fetchurl { - url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; - sha256 = "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac"; + url = "https://github.com/shirok/Gauche/releases/download/release${lib.replaceStrings ["."] ["_"] version}/Gauche-${version}.tgz"; + hash = "sha256-tK5kkhsHqWZhaV69WqwN7IE9GmjlRqYWCRE9eEP1thc="; }; nativeBuildInputs = [ pkg-config texinfo ]; diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index baa679b6e00d8..301cd9db78301 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -1,20 +1,20 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, gaucheBootstrap, pkg-config, texinfo -, libiconv, gdbm, openssl, zlib, mbedtls, cacert }: +, libiconv, gdbm, openssl, zlib, mbedtls, cacert, CoreServices }: stdenv.mkDerivation rec { pname = "gauche"; - version = "0.9.10"; + version = "0.9.13"; src = fetchFromGitHub { owner = "shirok"; repo = pname; rev = "release${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0ki1w7sa10ivmg51sqjskby0gsznb0d3738nz80x589033km5hmb"; + hash = "sha256-XD4zJzCktGi/E9sA6BVm9JVQBVrG5119EjZNbP1pVJU="; }; nativeBuildInputs = [ gaucheBootstrap pkg-config texinfo autoreconfHook ]; - buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ]; + buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; autoreconfPhase = '' ./DIST gen diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index a316a407d80dd..f1cc624b59e77 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.4.0"; + version = "9.4.5.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-arEmcK/Y5ciskwX6vkIFV5XF3fn46PGh5g4mDy1yTMA="; + hash = "sha256-pA94xGQczIZ1Lhay2iR/1ryfvPmkhkzxvjb3/3s1aEw="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix b/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix index d359a7ed82aeb..9de0ec4418628 100644 --- a/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix +++ b/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix @@ -3,6 +3,6 @@ }: fetchurl { - url = "https://pear.php.net/install-pear-nozlib.phar"; + url = "https://github.com/pear/pearweb_phars/raw/v1.10.21/install-pear-nozlib.phar"; hash = "sha256-UblKVcsm030tNSA6mdeab+h7ZhANNz7MkFf4Z1iigjs="; } diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 970da7c5c5a4f..d9b539926b833 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -12,23 +12,24 @@ to update all non-pinned libraries in that folder. """ import argparse +import collections import json import logging import os import re -import requests +import subprocess from concurrent.futures import ThreadPoolExecutor as Pool -from packaging.version import Version as _Version -from packaging.version import InvalidVersion +from typing import Any, Optional + +import requests from packaging.specifiers import SpecifierSet -from typing import Optional, Any -import collections -import subprocess +from packaging.version import InvalidVersion +from packaging.version import Version as _Version INDEX = "https://pypi.io/pypi" """url of PyPI""" -EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl'] +EXTENSIONS = ["tar.gz", "tar.bz2", "tar", "zip", ".whl"] """Permitted file extensions. These are evaluated from left to right and the first occurance is returned.""" PRERELEASES = False @@ -37,13 +38,16 @@ BULK_UPDATE = False GIT = "git" -NIXPKGS_ROOT = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode('utf-8').strip() +NIXPKGS_ROOT = ( + subprocess.check_output(["git", "rev-parse", "--show-toplevel"]) + .decode("utf-8") + .strip() +) logging.basicConfig(level=logging.INFO) class Version(_Version, collections.abc.Sequence): - def __init__(self, version): super().__init__(version) # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21` @@ -65,7 +69,7 @@ def _get_values(attribute, text): :returns: List of matches. """ - regex = fr'{re.escape(attribute)}\s+=\s+"(.*)";' + regex = rf'{re.escape(attribute)}\s+=\s+"(.*)";' regex = re.compile(regex) values = regex.findall(text) return values @@ -73,14 +77,19 @@ def _get_values(attribute, text): def _get_attr_value(attr_path: str) -> Optional[Any]: try: - response = subprocess.check_output([ - "nix", - "--extra-experimental-features", "nix-command", - "eval", - "-f", f"{NIXPKGS_ROOT}/default.nix", - "--json", - f"{attr_path}" - ]) + response = subprocess.check_output( + [ + "nix", + "--extra-experimental-features", + "nix-command", + "eval", + "-f", + f"{NIXPKGS_ROOT}/default.nix", + "--json", + f"{attr_path}", + ], + stderr=subprocess.DEVNULL, + ) return json.loads(response.decode()) except (subprocess.CalledProcessError, ValueError): return None @@ -100,12 +109,13 @@ def _get_unique_value(attribute, text): else: raise ValueError("no value found for {}".format(attribute)) + def _get_line_and_value(attribute, text, value=None): """Match attribute in text. Return the line and the value of the attribute.""" if value is None: - regex = rf'({re.escape(attribute)}\s+=\s+\"(.*)\";)' + regex = rf"({re.escape(attribute)}\s+=\s+\"(.*)\";)" else: - regex = rf'({re.escape(attribute)}\s+=\s+\"({re.escape(value)})\";)' + regex = rf"({re.escape(attribute)}\s+=\s+\"({re.escape(value)})\";)" regex = re.compile(regex) results = regex.findall(text) n = len(results) @@ -138,7 +148,7 @@ def _fetch_page(url): def _fetch_github(url): headers = {} - token = os.environ.get('GITHUB_API_TOKEN') + token = os.environ.get("GITHUB_API_TOKEN") if token: headers["Authorization"] = f"token {token}" r = requests.get(url, headers=headers) @@ -151,31 +161,26 @@ def _fetch_github(url): def _hash_to_sri(algorithm, value): """Convert a hash to its SRI representation""" - return subprocess.check_output([ - "nix", - "hash", - "to-sri", - "--type", algorithm, - value - ]).decode().strip() + return ( + subprocess.check_output(["nix", "hash", "to-sri", "--type", algorithm, value]) + .decode() + .strip() + ) def _skip_bulk_update(attr_name: str) -> bool: - return bool(_get_attr_value( - f"{attr_name}.skipBulkUpdate" - )) + return bool(_get_attr_value(f"{attr_name}.skipBulkUpdate")) SEMVER = { - 'major' : 0, - 'minor' : 1, - 'patch' : 2, + "major": 0, + "minor": 1, + "patch": 2, } def _determine_latest_version(current_version, target, versions): - """Determine latest version, given `target`. - """ + """Determine latest version, given `target`.""" current_version = Version(current_version) def _parse_versions(versions): @@ -193,7 +198,7 @@ def _determine_latest_version(current_version, target, versions): if len(ceiling) == 0: ceiling = None else: - ceiling[-1]+=1 + ceiling[-1] += 1 ceiling = Version(".".join(map(str, ceiling))) # We do not want prereleases @@ -210,17 +215,19 @@ def _get_latest_version_pypi(package, extension, current_version, target): url = "{}/{}/json".format(INDEX, package) json = _fetch_page(url) - versions = json['releases'].keys() + versions = json["releases"].keys() version = _determine_latest_version(current_version, target, versions) try: - releases = json['releases'][version] + releases = json["releases"][version] except KeyError as e: - raise KeyError('Could not find version {} for {}'.format(version, package)) from e + raise KeyError( + "Could not find version {} for {}".format(version, package) + ) from e for release in releases: - if release['filename'].endswith(extension): + if release["filename"].endswith(extension): # TODO: In case of wheel we need to do further checks! - sha256 = release['digests']['sha256'] + sha256 = release["digests"]["sha256"] break else: sha256 = None @@ -240,33 +247,40 @@ def _get_latest_version_github(package, extension, current_version, target): attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"python3Packages.{package}") try: homepage = subprocess.check_output( - ["nix", "eval", "-f", f"{NIXPKGS_ROOT}/default.nix", "--raw", f"{attr_path}.src.meta.homepage"])\ - .decode('utf-8') + [ + "nix", + "eval", + "-f", + f"{NIXPKGS_ROOT}/default.nix", + "--raw", + f"{attr_path}.src.meta.homepage", + ] + ).decode("utf-8") except Exception as e: raise ValueError(f"Unable to determine homepage: {e}") - owner_repo = homepage[len("https://github.com/"):] # remove prefix + owner_repo = homepage[len("https://github.com/") :] # remove prefix owner, repo = owner_repo.split("/") url = f"https://api.github.com/repos/{owner}/{repo}/releases" all_releases = _fetch_github(url) - releases = list(filter(lambda x: not x['prerelease'], all_releases)) + releases = list(filter(lambda x: not x["prerelease"], all_releases)) if len(releases) == 0: raise ValueError(f"{homepage} does not contain any stable releases") - versions = map(lambda x: strip_prefix(x['tag_name']), releases) + versions = map(lambda x: strip_prefix(x["tag_name"]), releases) version = _determine_latest_version(current_version, target, versions) - release = next(filter(lambda x: strip_prefix(x['tag_name']) == version, releases)) - prefix = get_prefix(release['tag_name']) + release = next(filter(lambda x: strip_prefix(x["tag_name"]) == version, releases)) + prefix = get_prefix(release["tag_name"]) # some attributes require using the fetchgit git_fetcher_args = [] - if (_get_attr_value(f"{attr_path}.src.fetchSubmodules")): + if _get_attr_value(f"{attr_path}.src.fetchSubmodules"): git_fetcher_args.append("--fetch-submodules") - if (_get_attr_value(f"{attr_path}.src.fetchLFS")): + if _get_attr_value(f"{attr_path}.src.fetchLFS"): git_fetcher_args.append("--fetch-lfs") - if (_get_attr_value(f"{attr_path}.src.leaveDotGit")): + if _get_attr_value(f"{attr_path}.src.leaveDotGit"): git_fetcher_args.append("--leave-dotGit") if git_fetcher_args: @@ -274,8 +288,10 @@ def _get_latest_version_github(package, extension, current_version, target): cmd = [ "nix-prefetch-git", f"https://github.com/{owner}/{repo}.git", - "--hash", algorithm, - "--rev", f"refs/tags/{release['tag_name']}" + "--hash", + algorithm, + "--rev", + f"refs/tags/{release['tag_name']}", ] cmd.extend(git_fetcher_args) response = subprocess.check_output(cmd) @@ -283,45 +299,60 @@ def _get_latest_version_github(package, extension, current_version, target): hash = _hash_to_sri(algorithm, document[algorithm]) else: try: - hash = subprocess.check_output([ - "nix-prefetch-url", - "--type", "sha256", - "--unpack", - f"{release['tarball_url']}" - ], stderr=subprocess.DEVNULL).decode('utf-8').strip() + hash = ( + subprocess.check_output( + [ + "nix-prefetch-url", + "--type", + "sha256", + "--unpack", + f"{release['tarball_url']}", + ], + stderr=subprocess.DEVNULL, + ) + .decode("utf-8") + .strip() + ) except (subprocess.CalledProcessError, UnicodeError): # this may fail if they have both a branch and a tag of the same name, attempt tag name - tag_url = str(release['tarball_url']).replace("tarball","tarball/refs/tags") - hash = subprocess.check_output([ - "nix-prefetch-url", - "--type", "sha256", - "--unpack", - tag_url - ], stderr=subprocess.DEVNULL).decode('utf-8').strip() + tag_url = str(release["tarball_url"]).replace( + "tarball", "tarball/refs/tags" + ) + hash = ( + subprocess.check_output( + ["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], + stderr=subprocess.DEVNULL, + ) + .decode("utf-8") + .strip() + ) return version, hash, prefix FETCHERS = { - 'fetchFromGitHub' : _get_latest_version_github, - 'fetchPypi' : _get_latest_version_pypi, - 'fetchurl' : _get_latest_version_pypi, + "fetchFromGitHub": _get_latest_version_github, + "fetchPypi": _get_latest_version_pypi, + "fetchurl": _get_latest_version_pypi, } -DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz' +DEFAULT_SETUPTOOLS_EXTENSION = "tar.gz" FORMATS = { - 'setuptools' : DEFAULT_SETUPTOOLS_EXTENSION, - 'wheel' : 'whl', - 'pyproject' : 'tar.gz', - 'flit' : 'tar.gz' + "setuptools": DEFAULT_SETUPTOOLS_EXTENSION, + "wheel": "whl", + "pyproject": "tar.gz", + "flit": "tar.gz", } + def _determine_fetcher(text): # Count occurrences of fetchers. - nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys()) + nfetchers = sum( + text.count("src = {}".format(fetcher)) for fetcher in FETCHERS.keys() + ) if nfetchers == 0: raise ValueError("no fetcher.") elif nfetchers > 1: @@ -329,7 +360,7 @@ def _determine_fetcher(text): else: # Then we check which fetcher to use. for fetcher in FETCHERS.keys(): - if 'src = {}'.format(fetcher) in text: + if "src = {}".format(fetcher) in text: return fetcher @@ -341,47 +372,46 @@ def _determine_extension(text, fetcher): - fetchurl, we determine the extension from the url. - fetchFromGitHub we simply use `.tar.gz`. """ - if fetcher == 'fetchPypi': + if fetcher == "fetchPypi": try: - src_format = _get_unique_value('format', text) + src_format = _get_unique_value("format", text) except ValueError: - src_format = None # format was not given + src_format = None # format was not given try: - extension = _get_unique_value('extension', text) + extension = _get_unique_value("extension", text) except ValueError: - extension = None # extension was not given + extension = None # extension was not given if extension is None: if src_format is None: - src_format = 'setuptools' - elif src_format == 'other': + src_format = "setuptools" + elif src_format == "other": raise ValueError("Don't know how to update a format='other' package.") extension = FORMATS[src_format] - elif fetcher == 'fetchurl': - url = _get_unique_value('url', text) + elif fetcher == "fetchurl": + url = _get_unique_value("url", text) extension = os.path.splitext(url)[1] - if 'pypi' not in url: - raise ValueError('url does not point to PyPI.') + if "pypi" not in url: + raise ValueError("url does not point to PyPI.") - elif fetcher == 'fetchFromGitHub': + elif fetcher == "fetchFromGitHub": extension = "tar.gz" return extension def _update_package(path, target): - # Read the expression - with open(path, 'r') as f: + with open(path, "r") as f: text = f.read() # Determine pname. Many files have more than one pname - pnames = _get_values('pname', text) + pnames = _get_values("pname", text) # Determine version. - version = _get_unique_value('version', text) + version = _get_unique_value("version", text) # First we check how many fetchers are mentioned. fetcher = _determine_fetcher(text) @@ -393,8 +423,12 @@ def _update_package(path, target): for pname in pnames: if BULK_UPDATE and _skip_bulk_update(f"python3Packages.{pname}"): raise ValueError(f"Bulk update skipped for {pname}") + elif _get_attr_value(f"python3Packages.{pname}.cargoDeps") is not None: + raise ValueError(f"Cargo dependencies are unsupported, skipping {pname}") try: - new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target) + new_version, new_sha256, prefix = FETCHERS[fetcher]( + pname, extension, version, target + ) successful_fetch = True break except ValueError: @@ -411,7 +445,7 @@ def _update_package(path, target): if not new_sha256: raise ValueError("no file available for {}.".format(pname)) - text = _replace_value('version', new_version, text) + text = _replace_value("version", new_version, text) # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts # sri hashes have been the default format since nix 2.4+ @@ -421,16 +455,16 @@ def _update_package(path, target): if old_hash := _get_attr_value(f"python3Packages.{pname}.src.outputHash"): # fetchers can specify a sha256, or a sri hash try: - text = _replace_value('hash', sri_hash, text, old_hash) + text = _replace_value("hash", sri_hash, text, old_hash) except ValueError: - text = _replace_value('sha256', sri_hash, text, old_hash) + text = _replace_value("sha256", sri_hash, text, old_hash) else: raise ValueError(f"Unable to retrieve old hash for {pname}") - if fetcher == 'fetchFromGitHub': + if fetcher == "fetchFromGitHub": # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` # in which no string value is meant to be substituted. However, we can just overwrite the previous value. - regex = r'(rev\s+=\s+[^;]*;)' + regex = r"(rev\s+=\s+[^;]*;)" regex = re.compile(regex) matches = regex.findall(text) n = len(matches) @@ -442,30 +476,33 @@ def _update_package(path, target): match = matches[0] text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') # incase there's no prefix, just rewrite without interpolation - text = text.replace('"${version}";', 'version;') + text = text.replace('"${version}";', "version;") - with open(path, 'w') as f: + with open(path, "w") as f: f.write(text) - logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version)) + logging.info( + "Path {}: updated {} from {} to {}".format( + path, pname, version, new_version + ) + ) result = { - 'path' : path, - 'target': target, - 'pname': pname, - 'old_version' : version, - 'new_version' : new_version, + "path": path, + "target": target, + "pname": pname, + "old_version": version, + "new_version": new_version, #'fetcher' : fetcher, - } + } return result def _update(path, target): - # We need to read and modify a Nix expression. if os.path.isdir(path): - path = os.path.join(path, 'default.nix') + path = os.path.join(path, "default.nix") # If a default.nix does not exist, we quit. if not os.path.isfile(path): @@ -485,32 +522,41 @@ def _update(path, target): def _commit(path, pname, old_version, new_version, pkgs_prefix="python: ", **kwargs): - """Commit result. - """ + """Commit result.""" + + msg = f"{pkgs_prefix}{pname}: {old_version} -> {new_version}" - msg = f'{pkgs_prefix}{pname}: {old_version} -> {new_version}' + if changelog := _get_attr_value(f"{pkgs_prefix}{pname}.meta.changelog"): + msg += f"\n\n{changelog}" try: - subprocess.check_call([GIT, 'add', path]) - subprocess.check_call([GIT, 'commit', '-m', msg]) + subprocess.check_call([GIT, "add", path]) + subprocess.check_call([GIT, "commit", "-m", msg]) except subprocess.CalledProcessError as e: - subprocess.check_call([GIT, 'checkout', path]) - raise subprocess.CalledProcessError(f'Could not commit {path}') from e + subprocess.check_call([GIT, "checkout", path]) + raise subprocess.CalledProcessError(f"Could not commit {path}") from e return True def main(): - epilog = """ environment variables: GITHUB_API_TOKEN\tGitHub API token used when updating github packages """ - parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, epilog=epilog) - parser.add_argument('package', type=str, nargs='+') - parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major') - parser.add_argument('--commit', action='store_true', help='Create a commit for each package update') - parser.add_argument('--use-pkgs-prefix', action='store_true', help='Use python3Packages.${pname}: instead of python: ${pname}: when making commits') + parser = argparse.ArgumentParser( + formatter_class=argparse.RawDescriptionHelpFormatter, epilog=epilog + ) + parser.add_argument("package", type=str, nargs="+") + parser.add_argument("--target", type=str, choices=SEMVER.keys(), default="major") + parser.add_argument( + "--commit", action="store_true", help="Create a commit for each package update" + ) + parser.add_argument( + "--use-pkgs-prefix", + action="store_true", + help="Use python3Packages.${pname}: instead of python: ${pname}: when making commits", + ) args = parser.parse_args() target = args.target @@ -545,6 +591,5 @@ environment variables: logging.info("{} package(s) updated".format(count)) - -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 72ed2a9d75ae7..4c5efaa7d5453 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -50,16 +50,16 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.11"; # always change at once with ./minimal.nix + version = "8.11.1"; # always change at once with ./minimal.nix - src = (lib.makeOverridable ({ name, sha256 }: + src = (lib.makeOverridable ({ name, hash }: fetchurl { url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - inherit sha256; + inherit hash; } )) { name = "${pname}-${version}"; - sha256 = "sha256-lIrXmTyTnk7n54zOvl7qN8CkbiKgYj66k3fgEolk93w="; + hash = "sha256-5ZqwMLkqeONYnsQFxdJfpRdojCCZAjO9aMs0Vo1lTAU="; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 68e3faa42935e..73143f432d7fe 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -6,7 +6,7 @@ racket.overrideAttrs (oldAttrs: rec { version = oldAttrs.version; src = oldAttrs.src.override { name = "${pname}-${version}"; - sha256 = "sha256-IsWWpZi5JXZV2AlLTjFtFj7nu15jWw4Htzgs2Wew54U="; + hash = "sha256-H1X9bhQw9yOaESbK4+tveFWVb4EyMNGLKukwKAo588w="; }; meta = oldAttrs.meta // { diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 041ac00b2c3ae..d914b7a1fac22 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, cctools-port , perl , CoreServices , ApplicationServices @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2023.09"; + version = "2023.10"; src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; rev = version; - hash = "sha256-/78Qr/Td+dIBlzK0kYa2E4duxEjMj2haefw9Uia+3EA="; + hash = "sha256-1w6oMoxDro/AHE+QvjKUx9cxNpYuVSXYrRMh31ksgoQ="; fetchSubmodules = true; }; @@ -29,6 +30,10 @@ stdenv.mkDerivation rec { --replace '`sw_vers -productVersion`' '"$MACOSX_DEPLOYMENT_TARGET"' ''; + nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + cctools-port + ]; + buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; doCheck = false; # MoarVM does not come with its own test suite diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 3aa72be013921..8613beaef905f 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "15.0.0"; + version = "15.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-oX8xhSyK7D5gFvgTJuXK59kcuYDa/9w25ndfwfhGPDE="; + hash = "sha256-9vArmudz1Avxz46IS9FZIKbs8wZXoeWMd/FGLmpPitw="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-cTQrC4xXgx6HMMq5TqGnFLhGAHGt57zKXp1Cc8jEX8Y="; + cargoHash = "sha256-/mX9zUN+dZoOCOPMeWCJ9U7KfI6JnFl8B2leYosy2jQ="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/accounts-qml-module/default.nix b/pkgs/development/libraries/accounts-qml-module/default.nix new file mode 100644 index 0000000000000..aa68cb105af37 --- /dev/null +++ b/pkgs/development/libraries/accounts-qml-module/default.nix @@ -0,0 +1,88 @@ +{ stdenv +, lib +, fetchFromGitLab +, accounts-qt +, dbus-test-runner +, pkg-config +, qmake +, qtbase +, qtdeclarative +, signond +, xvfb-run +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "accounts-qml-module"; + version = "0.7-unstable-2022-10-28"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "accounts-qml-module"; + rev = "05e79ebbbf3784a87f72b7be571070125c10dfe3"; + hash = "sha256-ZpnkZauowLPBnO3DDDtG/x07XoQGVNqEF8AQB5TZK84="; + }; + + postPatch = '' + substituteInPlace src/src.pro \ + --replace '$$[QT_INSTALL_BINS]/qmlplugindump' 'qmlplugindump' \ + --replace '$$[QT_INSTALL_QML]' '${placeholder "out"}/${qtbase.qtQmlPrefix}' + + # Don't install test binary + sed -i tests/tst_plugin.pro \ + -e '/TARGET = tst_plugin/a INSTALLS -= target' + '' + lib.optionalString (!finalAttrs.doCheck) '' + sed -i accounts-qml-module.pro -e '/tests/d' + ''; + + # QMake can't find Qt modules in buildInputs + strictDeps = false; + + nativeBuildInputs = [ + pkg-config + qmake + qtdeclarative # qmlplugindump + ]; + + buildInputs = [ + accounts-qt + qtbase + qtdeclarative + signond + ]; + + nativeCheckInputs = [ + dbus-test-runner + xvfb-run + ]; + + dontWrapQtApps = true; + + qmakeFlags = [ + # Needs qdoc, https://github.com/NixOS/nixpkgs/pull/245379 + "CONFIG+=no_docs" + ]; + + postConfigure = '' + make qmake_all + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = '' + # Needs xcb platform plugin + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; + + preInstall = '' + # Same plugin needed here, re-export in case checks are disabled + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; + + meta = with lib; { + description = "QML bindings for libaccounts-qt + libsignon-qt"; + homepage = "https://gitlab.com/accounts-sso/accounts-qml-module"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 10cc9b72f77fd..6cbe6fc1899da 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.2.98"; + version = "5.2.111"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-p3r8GVhxShTanEI/tS8Dq59I7VKMDX1blz6S236XFqQ="; + hash = "sha256-sLvvQhJ9uVt/dx57xs9ftY/ETi46xmyGDH8372zpqj8="; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index cca1da7ec627b..58906b608231d 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.22.0"; + version = "3.23.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-Fw0pMTc0Zmr4RfH2rdPgpOODZW9CL5UbDbIeH6A4zZQ="; + hash = "sha256-jqeLNKOGdGtAVx7ExGGDxxgi5zDmQgmJ6bxIuguaM3k="; fetchSubmodules = true; }; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { cudaPackages.cuda_cudart cudaPackages.libcublas cudaPackages.libcurand - ] ++ lib.optionals withCuDNN [ + ] ++ lib.optionals (withCUDA && withCuDNN) [ cudaPackages.cudnn ] ++ lib.optionals withOneDNN [ oneDNN @@ -87,5 +87,8 @@ stdenv.mkDerivation rec { changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa misuzu ]; + broken = + (lib.versionOlder cudaPackages.cudaVersion "11.4") + || !(withCuDNN -> withCUDA); }; } diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 92b6397c41798..32356fd9ccab7 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,5 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libpng, libjpeg -, guiSupport ? false, libX11 +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, fftw +, libpng +, libjpeg +, libwebp +, openblas +, guiSupport ? false +, libX11 # see http://dlib.net/compile.html , sse4Support ? stdenv.hostPlatform.sse4_1Support @@ -23,12 +33,20 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" - "-DUSE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}" - "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; + (lib.cmakeBool "USE_DLIB_USE_CUDA" cudaSupport) + (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support) + (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport) + ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; + + buildInputs = [ + fftw + libpng + libjpeg + libwebp + openblas + ] ++ lib.optional guiSupport libX11; meta = with lib; { description = "A general purpose cross-platform C++ machine learning library"; diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index d9a107bf6497b..11b6898382263 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "example-robot-data"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "Gepetto"; - repo = finalAttrs.pname; + repo = "example-robot-data"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-xeNbx1f9QCAOJrXfkk3jo9XH2/4HNtnRA1OSnqA2cLs="; + hash = "sha256-dLW8QaQhTTDcE4QCP9uV4ykOqwc3nbPUmF1B77r8CHQ="; }; strictDeps = true; diff --git a/pkgs/development/libraries/futuresql/default.nix b/pkgs/development/libraries/futuresql/default.nix index 2adc148701a74..fb6e4061e6f62 100644 --- a/pkgs/development/libraries/futuresql/default.nix +++ b/pkgs/development/libraries/futuresql/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.1.1"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; + url = "mirror://kde/stable/futuresql/futuresql-${version}.tar.xz"; hash = "sha256-5E7Y1alhizynuimD7ZxfdXLm4KWxmflIaINLccy+vUM="; }; diff --git a/pkgs/development/libraries/gr-framework/default.nix b/pkgs/development/libraries/gr-framework/default.nix index 42994adc73751..2157a18f58d15 100644 --- a/pkgs/development/libraries/gr-framework/default.nix +++ b/pkgs/development/libraries/gr-framework/default.nix @@ -3,8 +3,10 @@ , fetchFromGitHub , nix-update-script -, cairo , cmake +, wrapQtAppsHook + +, cairo , ffmpeg , freetype , ghostscript @@ -13,20 +15,19 @@ , libtiff , qhull , qtbase -, wrapQtAppsHook , xorg , zeromq }: stdenv.mkDerivation rec { pname = "gr-framework"; - version = "0.72.10"; + version = "0.72.11"; src = fetchFromGitHub { owner = "sciapp"; repo = "gr"; rev = "v${version}"; - hash = "sha256-ZFaun8PBtPTmhZ0+OHzUu27NvcJGxsImh+c7ZvCTNa0="; + hash = "sha256-HspDRqO/JKpPeHOfctYAOwwR3y1u+GW3v0OnN7OfLT4="; }; patches = [ @@ -60,11 +61,11 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = { + meta = with lib; { description = "GR framework is a graphics library for visualisation applications"; homepage = "https://gr-framework.org"; - maintainers = [ lib.maintainers.paveloom ]; - license = lib.licenses.mit; - platforms = lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ paveloom ]; }; } diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index c2c1f37dbfb03..21bfdd858c294 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -6,6 +6,7 @@ , ninja , python3 , gtk4 +, glib , glibmm_2_68 , cairomm_1_16 , pangomm_2_48 @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { meson ninja python3 + glib # glib-compile-resources ]; buildInputs = [ diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index ef0030f1d3aba..de9dd96424991 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; rev = "v${version}"; - sha256 = "sha256-apKmIB34uqkqSCtTUzrUOhcRC5a2UG6KCdhp1jnXUgQ="; + sha256 = "sha256-INDQ0RqPMSsKXQ/QVDhpCg4qzghLA3zQUViduflLUFY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 4ff3e69c34ce9..17dfd7385e124 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -72,7 +72,7 @@ in { description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0"; }; - saxon-he = common { + saxon_9-he = common { pname = "saxon-he"; version = "9.9.0.1"; prog = "saxon-he"; @@ -83,4 +83,16 @@ in { }; description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1"; }; + + saxon-he = common { + pname = "saxon-he"; + version = "11.5"; + prog = "saxon-he"; + jar = "saxon-he-11.5"; + src = fetchurl { + url = "https://github.com/Saxonica/Saxon-HE/raw/a6d11dec3853326b661e9aff283e30b43c02e163/11/Java/SaxonHE11-5J.zip"; + sha256 = "2Nwh6dG3YAjc/OTr8DMOfbnRvdCWB0YsVP3ZLRbM9U0="; + }; + description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1"; + }; } diff --git a/pkgs/development/libraries/kpeoplevcard/default.nix b/pkgs/development/libraries/kpeoplevcard/default.nix index 2ba786800fb32..689b7c9869b69 100644 --- a/pkgs/development/libraries/kpeoplevcard/default.nix +++ b/pkgs/development/libraries/kpeoplevcard/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.1"; src = fetchurl { - url = "https://download.kde.org/stable/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + url = "mirror://kde/stable/kpeoplevcard/${finalAttrs.version}/kpeoplevcard-${finalAttrs.version}.tar.xz"; sha256 = "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd"; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 8c6eeb3f3fb1b..47bdd0ffb4809 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.10"; + version = "1.12.11"; src = fetchFromGitHub { - sha256 = "sha256-0AHChU96LOVCsd+b77nKV4lOt1FtbVfv+OSNvGjekYo="; + sha256 = "sha256-XB5qIXPe1Tu+cfxuL+HAfR9QQNiUY/noO51CVEz9hsU="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 3b4aed7a82151..76fbf815525e9 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.4.0"; + version = "1.4.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-LXrlTca50ALo+Nm55fwXNb4k3haLqHNnzLPc08VhA5s="; + hash = "sha256-SsQbCnNtgiRWMZerEjSSw+CU5m6bGRv8ILY/TITGtL4="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix index e9e5c19f777cb..5bc6ad6c5f2eb 100644 --- a/pkgs/development/libraries/libaec/default.nix +++ b/pkgs/development/libraries/libaec/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "libaec"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { domain = "gitlab.dkrz.de"; owner = "k202009"; repo = "libaec"; rev = "v${version}"; - sha256 = "sha256-5nsJrbJVqjXNb3exYgEvSGUq8ccy9HG+gwmBZvjnupc="; + sha256 = "sha256-mmiPpfUZE7W6Hzalr/tcJUFQe5kF4dYM1uZShjBsoVA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index cdae594d9b682..ec7f1ba26ab1e 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -1,27 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, bison, flex }: +{ lib, stdenv, fetchFromGitHub, cmake, bison, flex }: stdenv.mkDerivation rec { pname = "libcue"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lipnitsk"; repo = "libcue"; rev = "v${version}"; - sha256 = "1iqw4n01rv2jyk9lksagyxj8ml0kcfwk67n79zy1r6zv1xfp5ywm"; + hash = "sha256-ZMUUa8CmpFNparPsM/P2yvRto9E85EdTxpID5sKQbNI="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-43641.patch"; - url = "https://github.com/lipnitsk/libcue/commit/fdf72c8bded8d24cfa0608b8e97f2eed210a920e.patch"; - hash = "sha256-NjnSMUfman/SwLFWDIhtz2jCOLfpXGGGjO3QwRGURNg="; - }) - ]; - nativeBuildInputs = [ cmake bison flex ]; - doCheck = false; # fails all the tests (ctest) + doCheck = true; meta = with lib; { description = "CUE Sheet Parser Library"; diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/development/libraries/libdatovka/default.nix index 89ce56fe6bb8e..c4c840dc34cc6 100644 --- a/pkgs/development/libraries/libdatovka/default.nix +++ b/pkgs/development/libraries/libdatovka/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libdatovka"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; - sha256 = "sha256-EqCS77MpjfR0Td07WKB7jWRBxAoKRtbAgyyThFOJXL8="; + sha256 = "sha256-cZG86chuh/2bW7kADbnhPhhMwe+Nm63uYy3LIjNrRqo="; }; patches = [ diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 966dcb72535e1..551b2d30e951f 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -198,12 +198,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 3.1.0", + "event-listener 4.0.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -228,7 +228,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d736a74edf6c327b53dd9c932eae834253470ac5f0c55770e7e133bcbf986362" dependencies = [ - "async-channel 2.1.0", + "async-channel 2.1.1", "base64 0.21.5", "bytes", "chrono", @@ -707,18 +707,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" dependencies = [ "anstyle", "clap_lex", @@ -808,9 +808,9 @@ checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -818,9 +818,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -1064,9 +1064,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "default-net" @@ -1087,11 +1087,11 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.131.7" +version = "1.131.9" dependencies = [ "ansi_term", "anyhow", - "async-channel 2.1.0", + "async-channel 2.1.1", "async-imap", "async-native-tls", "async-smtp", @@ -1165,10 +1165,10 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.131.7" +version = "1.131.9" dependencies = [ "anyhow", - "async-channel 2.1.0", + "async-channel 2.1.1", "axum", "base64 0.21.5", "deltachat", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.131.7" +version = "1.131.9" dependencies = [ "ansi_term", "anyhow", @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.131.7" +version = "1.131.9" dependencies = [ "anyhow", "deltachat", @@ -1229,7 +1229,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.131.7" +version = "1.131.9" dependencies = [ "anyhow", "deltachat", @@ -1799,9 +1799,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" dependencies = [ "concurrent-queue", "parking", @@ -1810,11 +1810,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.0", "pin-project-lite", ] @@ -2123,9 +2123,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "group" @@ -2176,9 +2176,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -2461,8 +2461,7 @@ dependencies = [ [[package]] name = "imap-proto" version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305c25c6e69416059e3396c4a062b84dc7b0a782cd4c84d82bab268eb0421ec7" +source = "git+https://github.com/djc/tokio-imap.git?rev=01ff256a7e42a9f7d2732706f8b71a16ce93427e#01ff256a7e42a9f7d2732706f8b71a16ce93427e" dependencies = [ "nom", ] @@ -2506,8 +2505,8 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh" -version = "0.4.1" -source = "git+https://github.com/deltachat/iroh?branch=0.4-update-quic#36ca9ca017a101c00dfdf74a917b92bdc505ddbd" +version = "0.4.2" +source = "git+https://github.com/n0-computer/iroh?branch=maint-0.4#9881b7886235035a1124e4371f7a4cd59379e51b" dependencies = [ "abao", "anyhow", @@ -3068,9 +3067,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.59" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3109,9 +3108,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.95" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -3253,9 +3252,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pgp" @@ -3297,7 +3296,7 @@ dependencies = [ "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.3", + "rsa 0.9.5", "sha1", "sha2 0.10.8", "sha3", @@ -3989,9 +3988,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474" dependencies = [ "const-oid", "digest 0.10.7", @@ -4289,9 +4288,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -4316,9 +4315,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -5148,9 +5147,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typescript-type-def" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356e00027bd9ef773605a353070dc87684b25561a59087ea3ee3dd5fe8854e83" +checksum = "8a548b68faefac1ef83c3682cece0046b4f3efc943a067aacb4dfb99be299f60" dependencies = [ "serde_json", "typescript-type-def-derive", @@ -5158,9 +5157,9 @@ dependencies = [ [[package]] name = "typescript-type-def-derive" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e696c28431595138cc53892104528152cbcf26653ae0aa655e4eaede5b9f69" +checksum = "2f205a929a19c5dd74f80c9f795c33b4416f7efef7d7b2772f0eff96bdd71c35" dependencies = [ "darling 0.13.4", "ident_case", @@ -5323,9 +5322,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5333,9 +5332,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", @@ -5360,9 +5359,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5370,9 +5369,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", @@ -5383,9 +5382,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" @@ -5679,18 +5678,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "f43de342578a3a14a9314a2dab1942cbfcbe5686e1f91acdc513058063eafe18" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "e1012d89e3acb79fad7a799ce96866cfb8098b74638465ea1b1533d35900ca90" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 11e34045c36f1..0d7b96562104a 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -25,19 +25,20 @@ let outputHashes = { "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU="; "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; - "iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo="; + "imap-proto-0.16.3" = "sha256-okIHA8MQ1K/tcKHZYGh83zom1ULGHZ/KGxgcwiE1+sE="; + "iroh-0.4.2" = "sha256-VXNMmj+AvlY/W2JRWMICoNOqpFEahsUDxypHRg185Ao="; "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; }; }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.131.7"; + version = "1.131.9"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-QzNZBBQ0fFqQByaNRNebtnoljC4rQqVTxbNz2M3LDAc="; + hash = "sha256-xZai5RsrfT6bYzMpNdKncmDzBzcAcEtZZmh7f+3g5Hs="; }; patches = [ diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix index ab2da122da746..34089dbdcaa8b 100644 --- a/pkgs/development/libraries/libfabric/default.nix +++ b/pkgs/development/libraries/libfabric/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.19.0"; + version = "1.20.0"; enableParallelBuilding = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7VOhdZOPBe1qh8OK8OTNKA5I4A5whl6aOubAzsUDSRw="; + sha256 = "sha256-woRkm/5kLIv1ypSlCosP/ewYgnSXQJYzkuOqdHvEH8I="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 5096221184866..208bd35c6a12b 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.34"; + version = "1.1.35"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-e4J7K1AZyw3AvBNMj69VGKo7gtJ6Nr2ELjqgoqPlObU="; + sha256 = "sha256-GinEbclpIXMwry2J7Ny20S8G99mPgNLse2rs/IpfWoU="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 481f12e17526f..fe11b59f45239 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { built upon and follows the same principles as GNU MPFR. ''; - homepage = "http://mpc.multiprecision.org/"; + homepage = "https://www.multiprecision.org/mpc/"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 8c4e32b232c95..9707435dcd29d 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-LuPH0NAxzlgd7u10fZVh0UAXI3NZK+1dBjCnkOYFPcE="; + hash = "sha256-lCRmgiXFpz97eAXNNtddhQLJqOIMoRyVJlMVXvbpCdo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 31104b262af98..ff90c9b116ad6 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , bash-completion , pkg-config , perl @@ -12,13 +13,21 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - hash = "sha256-srJyd32eCIthoncvM9JQEKCWEOZxxc3YntaV4Ay8kZ8="; + hash = "sha256-UNHRphDw1ycRnp0KClzHlSuLIxs5Mc4gcjB+EF/smbY="; }; + patches = [ + (fetchpatch { + name = "CVE-2023-5871.patch"; + url = "https://gitlab.com/nbdkit/libnbd/-/commit/4451e5b61ca07771ceef3e012223779e7a0c7701.patch"; + hash = "sha256-zmg/kxSJtjp2w9917Sp33ezt7Ccj/inngzCUVesF1Tc="; + }) + ]; + nativeBuildInputs = [ bash-completion pkg-config diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 801b748695097..3fe89f891f8cb 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU="; + sha256 = "sha256-G/lu7J4UYPPRpxMWPMof8NSAo0kLUImSkvFFSLOpa2A="; }; outputs = [ "out" "dev" ] diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 2350217693101..acb0013035cbf 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "7.7.0"; + version = "7.7.5"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "sha256-O30czHwEDXz5xY4o3MWhmEK06OKTKMQCy0M6qwSEpy8="; + sha256 = "sha256-mvGPMbk4b8NmPvzy5hS+Au69NtDGha8ONTEQf6I3VZE="; }; nativeBuildInputs = [ python3 ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-shared --disable-documentation" ]; + CXXFLAGS = [ "-std=c++17" ]; meta = { description = "A C++ library to access PostgreSQL databases"; diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix index 8b61669d1c6dd..a3cec3788b581 100644 --- a/pkgs/development/libraries/libserdes/default.nix +++ b/pkgs/development/libraries/libserdes/default.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs configure lds-gen.pl + '' + lib.optionalString (stdenv.cc.libcxx != null) '' + # fix for https://github.com/NixOS/nixpkgs/issues/166205 + # llvm12+ isn't adding libc++abi + substituteInPlace src-cpp/Makefile \ + --replace "LIBS += -lstdc++" "LIBS += -lc++ -l${stdenv.cc.libcxx.cxxabi.libName}" ''; # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh: diff --git a/pkgs/development/libraries/libunicode/default.nix b/pkgs/development/libraries/libunicode/default.nix new file mode 100644 index 0000000000000..4241f5bc7676b --- /dev/null +++ b/pkgs/development/libraries/libunicode/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, catch2, fmt, python3 }: + +let + ucd-version = "15.0.0"; + + ucd-src = fetchzip { + url = "https://www.unicode.org/Public/${ucd-version}/ucd/UCD.zip"; + hash = "sha256-jj6bX46VcnH7vpc9GwM9gArG+hSPbOGL6E4SaVd0s60="; + stripRoot = false; + }; +in stdenv.mkDerivation (final: { + pname = "libunicode"; + version = "0.3.0-unstable-2023-03-05"; + + src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "libunicode"; + rev = "65e0c6ddf9648b94aa9bc7dda0718401efa9ef8e"; + hash = "sha256-F4CVU5MImkM571mD4iFxqTnNbk2GXKTGksqO4LH2uEk="; + }; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ catch2 fmt ]; + + cmakeFlags = [ "-DLIBUNICODE_UCD_DIR=${ucd-src}" ]; + + meta = with lib; { + description = "Modern C++17 Unicode library"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ moni ]; + }; +}) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 43fe69af2b0e2..f3d58613b25dc 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -9,16 +9,17 @@ , mpv , intel-vaapi-driver , vlc +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libva" + lib.optionalString minimal "-minimal"; version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; }; @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { # other drivers depending on libva and selected application users. # Please get a confirmation from the maintainer before adding more applications. inherit intel-compute-runtime intel-media-driver intel-vaapi-driver mpv vlc; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -52,9 +54,12 @@ stdenv.mkDerivation rec { driver-specific acceleration backends for each supported hardware vendor. ''; homepage = "https://01.org/linuxmedia/vaapi"; - changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; + changelog = "https://raw.githubusercontent.com/intel/libva/${finalAttrs.version}/NEWS"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + pkgConfigModules = [ "libva" "libva-drm" ] ++ lib.optionals (!minimal) [ + "libva-glx" "libva-wayland" "libva-x11" + ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 254769349b15d..2fbb29347d42f 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { libgudev ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform valgrind; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform + && lib.meta.availableOn stdenv.hostPlatform valgrind + && !stdenv.hostPlatform.isPower # one test times out + ; mesonFlags = [ "-Dtests=${if doCheck then "enabled" else "disabled"}" diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 2a1f0941f4dba..391874e531d73 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -13,11 +13,12 @@ , shared-mime-info , nixosTests , xz +, zstd }: stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.10"; + version = "0.3.14"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-uitnVqR2VVNAf8H1Q/u6LezhvfQJ/G2bE0Dv9dyP8+A="; + hash = "sha256-lpVXl/n/ecDLbbLQg9T+o4GdGZM7pNXGYTyVogNCl2E="; }; patches = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib xz + zstd ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/pkgs/development/libraries/libxmlb/installed-tests-path.patch index 0e74d131b2e8a..e9bd27e1fff14 100644 --- a/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ b/pkgs/development/libraries/libxmlb/installed-tests-path.patch @@ -1,9 +1,6 @@ -diff --git a/meson.build b/meson.build -index c98e1a7..025d9c8 100644 --- a/meson.build +++ b/meson.build -@@ -110,8 +110,8 @@ else - prefix = get_option('prefix') +@@ -111,7 +111,7 @@ else datadir = join_paths(prefix, get_option('datadir')) libexecdir = join_paths(prefix, get_option('libexecdir')) - installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name()) @@ -13,12 +10,11 @@ index c98e1a7..025d9c8 100644 endif gio = dependency('gio-2.0', version : '>= 2.45.8') -diff --git a/meson_options.txt b/meson_options.txt -index 54ab698..8a7122a 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -3,3 +3,4 @@ option('introspection', type : 'boolean', value : true, description : 'generate +@@ -3,4 +3,5 @@ option('introspection', type : 'boolean', value : true, description : 'generate option('tests', type : 'boolean', value : true, description : 'enable tests') option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') + option('zstd', type : 'boolean', value : true, description : 'enable zstd support') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix index f9bcdeb933b08..855fc48a2aef4 100644 --- a/pkgs/development/libraries/libzim/default.nix +++ b/pkgs/development/libraries/libzim/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "8.2.1"; + version = "9.0.0"; src = fetchFromGitHub { owner = "openzim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bhztigbiIGdVxBV5cpuHuuRGBN5UgC39w51uwLEq47w="; + hash = "sha256-K1S2MiugUeqCfPq0Oclmghb9064xrsKgUEVjFCJHt0U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index ed803772f730f..ded5a5990a608 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.20.0"; + version = "7.22.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-5yELGA3U/YkINEtRyr/tb3HjWMQjqKIWjUbH7ZFMgLU="; + hash = "sha256-vJKpeEdQIWBQRRdDui5ibSZtD8qUlDZBD+UQE+0cQqk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 9c1c8b422a98a..2d383c876cba4 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -89,14 +89,16 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; - # When building a wide-character (Unicode) build, create backward - # compatibility links from the the "normal" libraries to the - # wide-character libraries (e.g. libncurses.so to libncursesw.so). postFixup = let abiVersion-extension = if stdenv.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in '' # Determine what suffixes our libraries have suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)" + '' + # When building a wide-character (Unicode) build, create backward + # compatibility links from the the "normal" libraries to the + # wide-character libraries (e.g. libncurses.so to libncursesw.so). + + lib.optionalString unicodeSupport '' libs="$(ls $dev/lib/pkgconfig | tr ' ' '\n' | sed "s,\(.*\)$suffix\.pc,\1,g")" suffixes="$(echo "$suffix" | awk '{for (i=1; i < length($0); i++) {x=substr($0, i+1, length($0)-i); print x}}')" @@ -139,10 +141,13 @@ stdenv.mkDerivation (finalAttrs: { ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc done done + '' + # Unconditional patches. Leading newline is to avoid mass rebuilds. + + '' # add pkg-config aliases for libraries that are built-in to libncurses(w) for library in tinfo tic; do - for suffix in "" w; do + for suffix in "" ${lib.optionalString unicodeSupport "w"}; do ln -svf ncurses$suffix.pc $dev/lib/pkgconfig/$library$suffix.pc done done diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index cb5aa49ec612f..4df09d278f6d6 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.6.0-prerelease"; + version = "1.6.0"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; - rev = "a54820ff0e1b74554c7f649e8386ee8c4ecd98f5"; - sha256 = "sha256-4Vj8nf3c45Y8LJ79YUOrNAAGMmfygdPtAJrs+JuFiUM="; + rev = "v${version}"; + hash = "sha256-Kq8QxPU6SiTk0Ev2IJoktSPjVOlAS4/e1PQvw2+e8UA="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/pkgs/development/libraries/open62541/default.nix b/pkgs/development/libraries/open62541/default.nix index e25ac7bfca51d..7799c6d80ae3f 100644 --- a/pkgs/development/libraries/open62541/default.nix +++ b/pkgs/development/libraries/open62541/default.nix @@ -5,8 +5,10 @@ , cmake , pkg-config , check +, libxcrypt , subunit , python3Packages +, nix-update-script , withDoc ? false , graphviz-nox @@ -31,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-XmoLmBGTMA6cejLiNU8hAVnHd35eh6lTIu9csmiR+4U="; + hash = "sha256-koifSynnJX9IuwX8HUT1TzHoKgJfweNGAVlqUx7nEc4="; fetchSubmodules = true; }; @@ -82,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ check + libxcrypt subunit ]; @@ -126,6 +129,8 @@ stdenv.mkDerivation (finalAttrs: { rm -r bin/libopen62541* ''; + passthru.updateScript = nix-update-script { }; + passthru.tests = let open62541Full = encBackend: open62541.override { withDoc = true; @@ -151,6 +156,7 @@ stdenv.mkDerivation (finalAttrs: { OPC UA-based communication into existing applications. ''; homepage = "https://www.open62541.org"; + changelog = "https://github.com/open62541/open62541/releases/tag/v${finalAttrs.version}"; license = licenses.mpl20; maintainers = with maintainers; [ panicgh ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index a0f520dcb6cea..f2e98e0d34b6e 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.4.15.0"; + version = "2.5.5.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "v${version}"; - hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M="; + hash = "sha256-FtUZqk1m9ahdnwhrBeMFkUbV0dangMY/w9ShevCASfo="; }; # Workaround broken zlib version detecion in CMake < 3.37. diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 43f2eae809355..0fae50cdbfedb 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; # 1.90 is alpha for API 2. freeze = "1.90.0"; }; diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index c58ff8399aec8..a5bdb729a102b 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.16"; + version = "0.4.17"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-BJ4Q34wLGQNxoihH+M8NBY5ZDw/D9RMda9GvFw7BemY="; + hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 6603130922022..3723a6806ad9d 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "sha256-HPaPmsCJ81NaS7mgRGbR7KFG6AM3s6HXdWKdfREhcLc="; + hash = "sha256-FP3y/YHsPPqey4QfxIiC4QjruuK1K2Bg+2QL2gXDT+k="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 538687dce58a0..f77fdac059ce6 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -3,6 +3,7 @@ , stdenv , qtbase , qtdeclarative +, qtquick3d , qtshadertools , qtsvg , pkg-config @@ -12,8 +13,11 @@ , gst-plugins-good , gst-libav , gst-vaapi +, ffmpeg_6 +, libva , libpulseaudio , wayland +, libXrandr , elfutils , libunwind , orc @@ -23,12 +27,14 @@ qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libunwind orc ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ]; - propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ] + buildInputs = [ libunwind orc ffmpeg_6 ] + ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools qtquick3d ] ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + cmakeFlags = [ "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-include AudioToolbox/AudioToolbox.h"; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin diff --git a/pkgs/development/libraries/qzxing/default.nix b/pkgs/development/libraries/qzxing/default.nix new file mode 100644 index 0000000000000..4cb224e2c040f --- /dev/null +++ b/pkgs/development/libraries/qzxing/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchFromGitHub +, nix-update-script +, testers +, qmake +, qtmultimedia +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qzxing"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "ftylitak"; + repo = "qzxing"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ASgsF5ocNWAiIy2jm6ygpDkggBcEpno6iVNWYkuWcVI="; + }; + + # QMake can't find qtmultimedia in buildInputs + strictDeps = false; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtmultimedia + ]; + + dontWrapQtApps = true; + + preConfigure = '' + cd src + ''; + + qmakeFlags = [ + "CONFIG+=qzxing_qml" + "CONFIG+=qzxing_multimedia" + "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" + ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Qt/QML wrapper library for the ZXing library"; + homepage = "https://github.com/ftylitak/qzxing"; + license = licenses.asl20; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; + pkgConfigModules = [ + "QZXing" + ]; + }; +}) diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/development/libraries/rure/Cargo.lock index 68a1719d08014..48e04d1f5acb7 100644 --- a/pkgs/development/libraries/rure/Cargo.lock +++ b/pkgs/development/libraries/rure/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "memchr" diff --git a/pkgs/development/libraries/science/math/cudnn/releases.nix b/pkgs/development/libraries/science/math/cudnn/releases.nix index b82dd78178c0e..1cca4d9d015db 100644 --- a/pkgs/development/libraries/science/math/cudnn/releases.nix +++ b/pkgs/development/libraries/science/math/cudnn/releases.nix @@ -169,17 +169,17 @@ hash = "sha256-edd6dpx+cXWrx7XC7VxJQUjAYYqGQThyLIh/lcYjd3w="; } { - version = "8.9.1.23"; + version = "8.9.6.50"; minCudaVersion = "11.0"; maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.1.23_cuda11-archive.tar.xz"; - hash = "sha256-ptmIcmfihZDJ25XOZcvpamaN8DUjOLfTN+BTLe0zSFw="; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda11-archive.tar.xz"; + hash = "sha256-oOLvVemfTNZH99HaqlqkUE/6M1ujAYbVwyiPL0ffBX4="; } { - version = "8.9.1.23"; + version = "8.9.6.50"; minCudaVersion = "12.0"; - maxCudaVersion = "12.1"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.1.23_cuda12-archive.tar.xz"; - hash = "sha256-NRY8XFQr4MURc4sn4lI1GTy+7cXg4AbkSxzerxki6D4="; + maxCudaVersion = "12.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda12-archive.tar.xz"; + hash = "sha256-FyIlnblSZbs4E0OKWhxuzZed6JrkU2YDkEBC4STTAtU="; } ] diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index d1df264564471..d877e19a6dd68 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,85 +1,113 @@ -{ lib -, backendStdenv -, fetchFromGitHub -, python3 -, which -, autoAddOpenGLRunpathHook -, cuda_cccl -, cuda_cudart -, cuda_nvcc -, cudaFlags -, cudaVersion -# passthru.updateScript -, gitUpdater +# NOTE: Though NCCL is called within the cudaPackages package set, we avoid passing in +# the names of dependencies from that package set directly to avoid evaluation errors +# in the case redistributable packages are not available. +{ + lib, + fetchFromGitHub, + python3, + which, + cudaPackages, + # passthru.updateScript + gitUpdater, }: let - # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" - gencode = lib.concatStringsSep " " cudaFlags.gencode; + + inherit (cudaPackages) + autoAddOpenGLRunpathHook + backendStdenv + cuda_cccl + cuda_cudart + cuda_nvcc + cudaFlags + cudatoolkit + cudaVersion + ; in -backendStdenv.mkDerivation (finalAttrs: { - pname = "nccl"; - version = "2.19.3-1"; +backendStdenv.mkDerivation ( + finalAttrs: { + pname = "nccl"; + version = "2.19.3-1"; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; - }; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; + }; - outputs = [ "out" "dev" ]; + strictDeps = true; - nativeBuildInputs = [ - which - autoAddOpenGLRunpathHook - cuda_nvcc - python3 - ]; + outputs = [ + "out" + "dev" + ]; - buildInputs = [ - cuda_cudart - ] - # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons - # against other version, like below, it's important that we use the same format. Otherwise, - # we'll get incorrect results. - # For example, lib.versionAtLeast "12.0" "12.0.0" == false. - ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ - cuda_cccl - ]; + nativeBuildInputs = + [ + which + autoAddOpenGLRunpathHook + python3 + ] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [cuda_nvcc]; + + buildInputs = + lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ + cuda_nvcc.dev # crt/host_config.h + cuda_cudart + ] + # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons + # against other version, like below, it's important that we use the same format. Otherwise, + # we'll get incorrect results. + # For example, lib.versionAtLeast "12.0" "12.0.0" == false. + ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [cuda_cccl]; - preConfigure = '' - patchShebangs ./src/device/generate.py - makeFlagsArray+=( - "NVCC_GENCODE=${gencode}" - ) - ''; + env.NIX_CFLAGS_COMPILE = toString ["-Wno-unused-function"]; - makeFlags = [ - "CUDA_HOME=${cuda_nvcc}" - "CUDA_LIB=${lib.getLib cuda_cudart}/lib" - "CUDA_INC=${lib.getDev cuda_cudart}/include" - "PREFIX=$(out)" - ]; + preConfigure = '' + patchShebangs ./src/device/generate.py + makeFlagsArray+=( + "NVCC_GENCODE=${lib.concatStringsSep " " cudaFlags.gencode}" + ) + ''; - postFixup = '' - moveToOutput lib/libnccl_static.a $dev - ''; + makeFlags = + ["PREFIX=$(out)"] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ + "CUDA_HOME=${cudatoolkit}" + "CUDA_LIB=${lib.getLib cudatoolkit}/lib" + "CUDA_INC=${lib.getDev cudatoolkit}/include" + ] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ + "CUDA_HOME=${cuda_nvcc}" + "CUDA_LIB=${lib.getLib cuda_cudart}/lib" + "CUDA_INC=${lib.getDev cuda_cudart}/include" + ]; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ]; + enableParallelBuilding = true; - # Run the update script with: `nix-shell maintainers/scripts/update.nix --argstr package cudaPackages.nccl` - passthru.updateScript = gitUpdater { - inherit (finalAttrs) pname version; - rev-prefix = "v"; - }; + postFixup = '' + moveToOutput lib/libnccl_static.a $dev + ''; - enableParallelBuilding = true; + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; - meta = with lib; { - description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; - homepage = "https://developer.nvidia.com/nccl"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ mdaiter orivej ] ++ teams.cuda.members; - }; -}) + meta = with lib; { + description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; + homepage = "https://developer.nvidia.com/nccl"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = + with maintainers; + [ + mdaiter + orivej + ] + ++ teams.cuda.members; + }; + } +) diff --git a/pkgs/development/libraries/science/math/nccl/tests.nix b/pkgs/development/libraries/science/math/nccl/tests.nix index 9d826b92f164a..5c2f29b7ed564 100644 --- a/pkgs/development/libraries/science/math/nccl/tests.nix +++ b/pkgs/development/libraries/science/math/nccl/tests.nix @@ -1,69 +1,84 @@ -{ backendStdenv -, config -, cuda_cccl -, cuda_cudart -, cuda_nvcc -, cudaVersion -, fetchFromGitHub -, gitUpdater -, lib -, mpi -, mpiSupport ? false -, nccl -, which +# NOTE: Though NCCL tests is called within the cudaPackages package set, we avoid passing in +# the names of dependencies from that package set directly to avoid evaluation errors +# in the case redistributable packages are not available. +{ + config, + cudaPackages, + fetchFromGitHub, + gitUpdater, + lib, + mpi, + mpiSupport ? false, + which, }: +let + inherit (cudaPackages) + backendStdenv + cuda_cccl + cuda_cudart + cuda_nvcc + cudatoolkit + cudaVersion + nccl + ; +in +backendStdenv.mkDerivation ( + finalAttrs: { -backendStdenv.mkDerivation (finalAttrs: { + pname = "nccl-tests"; + version = "2.13.8"; - pname = "nccl-tests"; - version = "2.13.8"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; + }; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; - }; + strictDeps = true; - strictDeps = true; + nativeBuildInputs = + [which] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [cuda_nvcc]; - nativeBuildInputs = [ - cuda_nvcc - which - ]; - - buildInputs = [ - cuda_cudart - nccl - ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ - cuda_cccl.dev # <nv/target> - ] ++ lib.optional mpiSupport mpi; + buildInputs = + [nccl] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ + cuda_nvcc.dev # crt/host_config.h + cuda_cudart + ] + ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # <nv/target> + ] + ++ lib.optionals mpiSupport [mpi]; - makeFlags = [ - "CUDA_HOME=${cuda_nvcc}" - "NCCL_HOME=${nccl}" - ] ++ lib.optionals mpiSupport [ - "MPI=1" - ]; + makeFlags = + ["NCCL_HOME=${nccl}"] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") ["CUDA_HOME=${cudatoolkit}"] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") ["CUDA_HOME=${cuda_nvcc}"] + ++ lib.optionals mpiSupport ["MPI=1"]; - enableParallelBuilding = true; + enableParallelBuilding = true; - installPhase = '' - mkdir -p $out/bin - cp -r build/* $out/bin/ - ''; + installPhase = '' + mkdir -p $out/bin + cp -r build/* $out/bin/ + ''; - passthru.updateScript = gitUpdater { - inherit (finalAttrs) pname version; - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; - meta = with lib; { - description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; - homepage = "https://github.com/NVIDIA/nccl-tests"; - platforms = platforms.linux; - license = licenses.bsd3; - broken = !config.cudaSupport || (mpiSupport && mpi == null); - maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members; - }; -}) + meta = with lib; { + description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; + homepage = "https://github.com/NVIDIA/nccl-tests"; + platforms = platforms.linux; + license = licenses.bsd3; + broken = !config.cudaSupport || (mpiSupport && mpi == null); + maintainers = with maintainers; [jmillerpdt] ++ teams.cuda.members; + }; + } +) diff --git a/pkgs/development/libraries/science/math/spooles/allocate.patch b/pkgs/development/libraries/science/math/spooles/allocate.patch new file mode 100644 index 0000000000000..71f539711e7b7 --- /dev/null +++ b/pkgs/development/libraries/science/math/spooles/allocate.patch @@ -0,0 +1,38 @@ +From cc153b180829c6b561765cbbb9b621d1142ff1cd Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Tue, 28 Nov 2023 13:13:44 +0000 +Subject: [PATCH] use proper format specifier for size_t + +--- + Utilities/MM.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Utilities/MM.h b/Utilities/MM.h +index 11e86c5..301c3ec 100644 +--- a/Utilities/MM.h ++++ b/Utilities/MM.h +@@ -33,18 +33,18 @@ if ( (count) > 0 ) { \ + if ( (ptr = (type *)malloc((unsigned long)((count)*sizeof(type)))) \ + == NULL ) {\ + fprintf(stderr, \ +- "\n ALLOCATE failure : bytes %d, line %d, file %s", \ ++ "\n ALLOCATE failure : bytes %zu, line %d, file %s", \ + (count)*sizeof(type), __LINE__, __FILE__) ; \ + exit(-1) ; } \ + else if ( MEMORY_DEBUG > 0 ) { \ + fprintf(stderr, \ +- "\n ALLOCATE : address %p, bytes %d, line %d, file %s", \ ++ "\n ALLOCATE : address %p, bytes %zu, line %d, file %s", \ + ptr, (count)*sizeof(type), __LINE__, __FILE__) ; } } \ + else if ( (count) == 0 ) { \ + ptr = NULL ; } \ + else { \ + fprintf(stderr, \ +- "\n ALLOCATE error : bytes %d, line %d, file %s", \ ++ "\n ALLOCATE error : bytes %zu, line %d, file %s", \ + (count)*sizeof(type), __LINE__, __FILE__) ; \ + exit(-1) ; } + /* +-- +2.42.0 + diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/development/libraries/science/math/spooles/default.nix index 6e94d093a2cbf..47738008b02d9 100644 --- a/pkgs/development/libraries/science/math/spooles/default.nix +++ b/pkgs/development/libraries/science/math/spooles/default.nix @@ -13,10 +13,14 @@ stdenv.mkDerivation rec { patches = [ ./spooles.patch + # fix compiler error where NULL is used as a zero parameter + ./transform.patch + # use proper format specifier for size_t + ./allocate.patch ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace makefile --replace '-Wl,-soname' '-Wl,-install_name' + substituteInPlace makefile --replace "-Wl,-soname," "-Wl,-install_name,$out/lib/" ''; buildPhase = '' diff --git a/pkgs/development/libraries/science/math/spooles/transform.patch b/pkgs/development/libraries/science/math/spooles/transform.patch new file mode 100644 index 0000000000000..3be3babe9d657 --- /dev/null +++ b/pkgs/development/libraries/science/math/spooles/transform.patch @@ -0,0 +1,43 @@ +From c5d0574182d76af3bf286dce0bb147ae3f098916 Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Tue, 28 Nov 2023 12:57:18 +0000 +Subject: [PATCH] fix compiler error: use zero, not NULL, in calls to IVinit + +--- + ETree/src/transform.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ETree/src/transform.c b/ETree/src/transform.c +index 1e36981..dbdfc70 100644 +--- a/ETree/src/transform.c ++++ b/ETree/src/transform.c +@@ -291,7 +291,7 @@ etree2 = ETree_compress(etree, mapIV) ; + remap the nzeros[] vector + ------------------------- + */ +-temp = IVinit(nfront, NULL) ; ++temp = IVinit(nfront, 0) ; + IVcopy(nfront, temp, nzeros) ; + IV_setSize(nzerosIV, nnew) ; + nzeros = IV_entries(nzerosIV) ; +@@ -453,7 +453,7 @@ etree2 = ETree_compress(etree, mapIV) ; + remap the nzeros[] vector + ------------------------- + */ +-temp = IVinit(nfront, NULL) ; ++temp = IVinit(nfront, 0) ; + IVcopy(nfront, temp, nzeros) ; + IV_setSize(nzerosIV, nnew) ; + nzeros = IV_entries(nzerosIV) ; +@@ -614,7 +614,7 @@ etree2 = ETree_compress(etree, mapIV) ; + remap the nzeros[] vector + ------------------------- + */ +-temp = IVinit(nfront, NULL) ; ++temp = IVinit(nfront, 0) ; + IVcopy(nfront, temp, nzeros) ; + IV_setSize(nzerosIV, nnew) ; + nzeros = IV_entries(nzerosIV) ; +-- +2.42.0 + diff --git a/pkgs/development/libraries/science/math/tensorrt/extension.nix b/pkgs/development/libraries/science/math/tensorrt/extension.nix index c6596dbaacde1..b4018c6cc284d 100644 --- a/pkgs/development/libraries/science/math/tensorrt/extension.nix +++ b/pkgs/development/libraries/science/math/tensorrt/extension.nix @@ -38,13 +38,13 @@ final: prev: let + ".tar.gz"; tensorRTVersions = { - "8.6.0" = [ + "8.6.1" = [ rec { - fileVersionCuda = "11.8"; - fullVersion = "8.6.0.12"; - sha256 = "sha256-wXMqEJPFerefoLaH8GG+Np5EnJwXeStmDzZj7Nj6e2M="; + fileVersionCuda = "12.0"; + fullVersion = "8.6.1.6"; + sha256 = "sha256-D4FXpfxTKZQ7M4uJNZE3M1CvqQyoEjnNrddYDNHrolQ="; tarball = tarballURL { inherit fileVersionCuda fullVersion; }; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ]; + supportedCudaVersions = [ "12.0" "12.1" ]; } ]; "8.5.3" = [ @@ -133,6 +133,8 @@ final: prev: let "11.6" = "8.4.0"; "11.7" = "8.5.3"; "11.8" = "8.5.3"; + "12.0" = "8.6.1"; + "12.1" = "8.6.1"; }.${cudaVersion} or "8.4.0"; in tensorRTPackages diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index 0b61047377f31..fba7517ccca6f 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -3,29 +3,23 @@ gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.8.0"; + version = "5.9.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - hash = "sha256-sXIpKdJ5930+W+FsxQ8DZOq/49XWMM1zV8dIzbQdcbc="; + hash = "sha256-JZh8sC/w2MRy3UyWYGMvU47XtWKGnLuUlCsVyyxd7zg="; }; patches = [ - (fetchpatch { - name = "sope-no-unnecessary-vars.patch"; - url = "https://github.com/Alinto/sope/commit/0751a2f11961fd7de4e2728b6e34e9ba4ba5887e.patch"; - hash = "sha256-1txj8Qehg2N7ZsiYQA2FXI4peQAE3HUwDYkJEP9WnEk="; - }) - (fetchpatch { - name = "sope-fix-wformat.patch"; - url = "https://github.com/Alinto/sope/commit/6adfadd5dd2da4041657ad071892f2c9b1704d22.patch"; - hash = "sha256-zCbvVdbeBeNo3/cDVdYbyUUC2z8D6Q5ga0plUoMqr98="; + (fetchpatch { # https://github.com/Alinto/sope/pull/66 + name = "sope-fix-gnustep-1.29.0+.patch"; + url = "https://github.com/Alinto/sope/pull/66/commits/9ec2744cc851b11886c3ebb723138e4d672bd5c7.patch"; + hash = "sha256-JgYRwjmjlitgzYz9Jfei5XJRThP1TunPjI0g5M2wZPA="; }) ]; - hardeningDisable = [ "format" ]; nativeBuildInputs = [ gnustep.make ]; buildInputs = [ gnustep.base libxml2 openssl ] ++ lib.optional (openldap != null) openldap @@ -49,7 +43,10 @@ gnustep.stdenv.mkDerivation rec { ++ lib.optional (mariadb != null) "--enable-mysql" ++ lib.optional (postgresql != null) "--enable-postgresql"; - env.GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf"; + env = { + GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf"; + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; # Move over the makefiles (see comment over preConfigure) postInstall = '' diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix index 24cfc3fc83b6f..9e916273809f0 100644 --- a/pkgs/development/libraries/spandsp/3.nix +++ b/pkgs/development/libraries/spandsp/3.nix @@ -9,11 +9,11 @@ , callPackage }: -(callPackage ./common.nix {}).overrideAttrs(finalAttrs: { +(callPackage ./common.nix {}).overrideAttrs(previousAttrs: { version = "3.0.0"; src = fetchFromGitHub { owner = "freeswitch"; - repo = finalAttrs.pname; + repo = previousAttrs.pname; rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7"; }; diff --git a/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch b/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch new file mode 100644 index 0000000000000..3c3fb50fc1525 --- /dev/null +++ b/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch @@ -0,0 +1,29 @@ +From 3f718fc1873c9c138684ea019e9bd42c9b24506c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Tue, 28 Nov 2023 11:28:11 +0100 +Subject: [PATCH] fix setuptools installation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + python/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/Makefile b/python/Makefile +index f835daa..b41995a 100644 +--- a/python/Makefile ++++ b/python/Makefile +@@ -12,7 +12,7 @@ setup_cmd += --root $(DESTDIR) + endif + + ifneq ($(CONFIG_PYDIR),) +-setup_cmd += --install-purelib $(CONFIG_PYDIR) ++setup_cmd += --root / --prefix $(CONFIG_PYDIR) + purelibdir := $(CONFIG_PYDIR) + else + purelibdir := $(shell python3 -c "import sysconfig; print(sysconfig.get_paths()['purelib'])") +-- +2.42.0 + diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index c7b83db534893..c62f54b140912 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { patches = [ # https://review.spdk.io/gerrit/c/spdk/spdk/+/20394 ./setuptools.patch + ./0001-fix-setuptools-installation.patch ]; postPatch = '' @@ -67,9 +68,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-dpdk=${dpdk}" - "--pydir=${placeholder "out"}/${python3.sitePackages}" + "--pydir=${placeholder "out"}" ]; + postCheck = '' + python3 -m spdk + ''; + env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling env.NIX_LDFLAGS = "-lbsd"; diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 73bf5c25ae542..d25aab35da220 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, windows }: stdenv.mkDerivation rec { @@ -14,7 +19,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + windows.mingw_w64_pthreads + ]; + + patches = lib.optionals stdenv.hostPlatform.isMinGW [ + ./no-msvc-compat-headers.patch + ]; cmakeFlags = [ # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly @@ -29,9 +42,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Secure, Reliable, Transport"; - homepage = "https://github.com/Haivision/srt"; - license = licenses.mpl20; + homepage = "https://github.com/Haivision/srt"; + license = licenses.mpl20; maintainers = with maintainers; [ nh2 ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/srt/no-msvc-compat-headers.patch b/pkgs/development/libraries/srt/no-msvc-compat-headers.patch new file mode 100644 index 0000000000000..ffededc7d54e1 --- /dev/null +++ b/pkgs/development/libraries/srt/no-msvc-compat-headers.patch @@ -0,0 +1,10 @@ +--- srt-1.3.2/common/filelist_win32.maf.orig 2018-06-15 21:44:11.000000000 +0200 ++++ srt-1.3.2/common/filelist_win32.maf 2018-09-25 20:26:36.903688700 +0200 +@@ -4,7 +4,6 @@ + # + # These are included by platform_sys.h header contained in ../srtcore/filelist.maf + # +-win/unistd.h + + SOURCES + win_time.cpp diff --git a/pkgs/development/libraries/termbench-pro/default.nix b/pkgs/development/libraries/termbench-pro/default.nix new file mode 100644 index 0000000000000..11edecf31cc78 --- /dev/null +++ b/pkgs/development/libraries/termbench-pro/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, cmake, fmt }: + +stdenv.mkDerivation { + pname = "termbench-pro"; + version = "unstable-2023-01-26"; + + src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "termbench-pro"; + rev = "a4feadd3a698e4fe2d9dd5b03d5f941534a25a91"; + hash = "sha256-/zpJY9Mecalk7dneYZYzmFOroopFGklWw62a+LbiUVs="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ fmt ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/lib + mv termbenchpro/tbp $out/bin + mv libtermbench/libtermbench.a $out/lib + + runHook postInstall + ''; + + meta = with lib; { + description = "Terminal Benchmarking as CLI and library"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ moni ]; + }; +} diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index c5d8d0fd3c498..1d68421c6dcdd 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tevent"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; - sha256 = "sha256-ZiqfJ3KBvPUGtrwKC6oD5EpiIpUW7jS8xwOguCqkaQU="; + sha256 = "sha256-GqWPIQF+2ML2Bq6Eqn55W1Q57dTdX2jxo4in1vtA9oI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index ae182ff461367..f8540d4ffaa06 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.18.0"; + version = "2.18.2"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - hash = "sha256-y5/kXODzkNKmMn8P+WOOWGy9Htd0nhXbUxmfw/SqSYY="; + hash = "sha256-uLiXhigYz3v7NgY38twot3sBHxZS5QCrOiPfME4wWzE="; }; patches = [ diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index bcd75412aab28..5bba7315f5cc4 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -32,6 +32,7 @@ , AVFoundation , AVKit , WebKit +, fetchpatch }: let catch = fetchFromGitHub { @@ -59,6 +60,14 @@ stdenv.mkDerivation rec { hash = "sha256-YkV150sDsfBEHvHne0GF6i8Y5881NrByPkLtPAmb24E="; }; + patches = [ + (fetchpatch { + name = "avoid_gtk3_crash.patch"; + url = "https://github.com/wxWidgets/wxWidgets/commit/8ea22b5e92bf46add0b20059f6e39a938858ff97.patch"; + hash = "sha256-zAyqVTdej4F3R7vVMLiKkXqJTAHDtGYJnyjaRyDmMOM="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 1fd30139bc14c..11f598b6544b1 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "45.0"; + version = "45.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lJWYhhyAAA/r8YzBKzchyVwbsdGTcfwhVtxPM971r/A="; + sha256 = "PpyoIQRABfs3vWjr5K0Zb8PQcoNVgUZ6IqSHnax7X90="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index ab9e00fe389af..8f5d5a3c01223 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, bash , fetchFromGitHub , makeWrapper , meson @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' - wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ grim slurp ]} + wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ bash grim slurp ]} ''; meta = with lib; { diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index bb1569b3a2584..e2d12c250171d 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-sPpRDoQuzyjqB+kwz0U2WFm/Byx7SueM3aCtpgy38JM="; + hash = "sha256-Zz44PCociYhUuHTS3HJNxJPCkiIl01FFe4//7jtgDsk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index fcde2f41ddceb..b1d016ba7dca8 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -514,6 +514,39 @@ buildLuarocksPackage { }; }) {}; +fzy = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +buildLuarocksPackage { + pname = "fzy"; + version = "1.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/fzy-1.0-1.rockspec"; + sha256 = "1v050lm3rn1k5wwi2nimlbp1b7j6b8vkwvhc1npyqzj8jv7w9w9n"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/swarn/fzy-lua", + "rev": "2d018a56e3a240bca4b3142a723b2f56392f3e4a", + "date": "2023-01-29T07:05:02-06:00", + "path": "/nix/store/nz19glmy52jbz46wl7xf0jd8m441klf0-fzy-lua", + "sha256": "0xknm5513a6nlariwxgqndf3wj8xals26swjsv06hx133ihna01x", + "hash": "sha256-PQBlYRwjdGjA1pJrIzRVHUk+XLP4dR6zotaoEUqpdnY=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/swarn/fzy-lua"; + description = "A fuzzy string-matching algorithm"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + gitsigns-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua }: buildLuarocksPackage { pname = "gitsigns.nvim"; @@ -2183,6 +2216,29 @@ buildLuarocksPackage { }; }) {}; +luasnip = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, jsregexp, lua, luaOlder }: +buildLuarocksPackage { + pname = "luasnip"; + version = "2.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luasnip-2.1.1-1.rockspec"; + sha256 = "1jrdai8qsanr6x2vqp70hipsxrxh0abvwr2xwh9p4wr29k4wyycb"; + }).outPath; + src = fetchzip { + url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.1.1.zip"; + sha256 = "0mbpwf3sxfrmrza13d9w0hlcmzlrj551g332syp1qhs94abfnnrd"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ jsregexp lua ]; + + meta = { + homepage = "https://github.com/L3MON4D3/LuaSnip"; + description = "Snippet Engine for Neovim written in Lua."; + license.fullName = "Apache-2.0"; + }; +}) {}; + luasocket = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasocket"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index e62b32ce6b60e..72334f6d0ff09 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -126,6 +126,16 @@ with prev; ''; }); + # Until https://github.com/swarn/fzy-lua/pull/8 is merged, + # we have to invoke busted manually + fzy = prev.fzy.overrideAttrs(oa: { + doCheck = true; + nativeCheckInputs = [ prev.busted ]; + checkPhase = '' + busted test/test.lua + ''; + }); + http = prev.http.overrideAttrs (oa: { patches = [ (fetchpatch { @@ -501,7 +511,7 @@ with prev; postPatch = '' substituteInPlace magick/wand/lib.lua \ - --replace @nix_wand@ ${imagemagick}/lib/libMagickWand-7.Q16HDRI.so + --replace @nix_wand@ ${imagemagick}/lib/libMagickWand-7.Q16HDRI${stdenv.hostPlatform.extensions.sharedLibrary} ''; # Requires ffi diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index ac9da31fcc0f8..d7e9f0efe9992 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -15,8 +15,11 @@ stdenv.mkDerivation rec { stripDebugList = [ "bin" ]; dontPatchELF = true; + enableParallelBuilding = true; + passthru = { incdir = "/avr/include"; + libdir = "/avr/lib"; }; meta = with lib; { diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md index 082a7fe757a48..439e4ea8188d0 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -52,13 +52,13 @@ Here's a simple example of how `resholve.mkDerivation` is already used in nixpkg resholve.mkDerivation rec { pname = "dgoss"; - version = "0.3.18"; + version = "0.4.1"; src = fetchFromGitHub { - owner = "aelsabbahy"; + owner = "goss-org"; repo = "goss"; - rev = "v${version}"; - sha256 = "01ssc7rnnwpyhjv96qy8drsskghbfpyxpsahk8s62lh8pxygynhv"; + rev = "refs/tags/v${version}"; + hash = "sha256-dpMTUBMEG5tDi7E6ZRg1KHqIj5qDlvwfwJEgq/5z7RE="; }; dontConfigure = true; @@ -81,11 +81,12 @@ resholve.mkDerivation rec { }; meta = with lib; { - homepage = "https://github.com/aelsabbahy/goss/blob/v${version}/extras/dgoss/README.md"; + homepage = "https://github.com/goss-org/goss/blob/v${version}/extras/dgoss/README.md"; + changelog = "https://github.com/goss-org/goss/releases/tag/v${version}"; description = "Convenience wrapper around goss that aims to bring the simplicity of goss to docker containers"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ hyzual ]; + maintainers = with maintainers; [ hyzual anthonyroussel ]; }; } ``` diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index 74f45f8ed3cca..8499ba7553da5 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -36,14 +36,14 @@ rec { # not exposed in all-packages resholveBuildTimeOnly = removeKnownVulnerabilities resholve; # resholve itself - resholve = callPackage ./resholve.nix { + resholve = (callPackage ./resholve.nix { inherit (source) rSrc version; inherit (deps.oil) oildev; inherit (deps) configargparse; inherit resholve-utils; # used only in tests resholve = resholveBuildTimeOnly; - }; + }); # funcs to validate and phrase invocations of resholve # and use those invocations to build packages resholve-utils = callPackage ./resholve-utils.nix { diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix index 80ffa4aa42ffe..3ec2f2dcb83b9 100644 --- a/pkgs/development/misc/resholve/deps.nix +++ b/pkgs/development/misc/resholve/deps.nix @@ -10,14 +10,9 @@ Notes on specific dependencies: - if/when python2.7 is removed from nixpkgs, this may need to figure out how to build oil's vendored python2 - - I'm not sure if glibcLocales is worth the addition here. It's to fix - a libc test oil runs. My oil fork just disabled the libc tests, but - I haven't quite decided if that's the right long-term call, so I - didn't add a patch for it here yet. */ rec { - # binlore = callPackage ./binlore.nix { }; oil = callPackage ./oildev.nix { inherit python27; inherit six; diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix index 70182722bde46..5e74bdc06acce 100644 --- a/pkgs/development/misc/resholve/source.nix +++ b/pkgs/development/misc/resholve/source.nix @@ -3,17 +3,11 @@ }: rec { - version = "0.9.0"; - rSrc = - # local build -> `make ci`; `make clean` to restore - # return to remote source - # if builtins.pathExists ./.local - # then ./. - # else - fetchFromGitHub { - owner = "abathur"; - repo = "resholve"; - rev = "v${version}"; - hash = "sha256-FRdCeeC2c3bMEXekEyilgW0PwFfUWGstZ5mXdmRPM5w="; - }; + version = "0.9.1"; + rSrc = fetchFromGitHub { + owner = "abathur"; + repo = "resholve"; + rev = "v${version}"; + hash = "sha256-hkLKQKhEMD1UQ9EunPmx5Tsh44q4+tYj820OXF2ueUo="; + }; } diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index 8f9da36c9de47..d9862bef7cf59 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -121,13 +121,17 @@ rec { cli = stdenv.mkDerivation { name = "resholve-test"; src = rSrc; + + dontBuild = true; + installPhase = '' mkdir $out cp *.ansi $out/ ''; + doCheck = true; buildInputs = [ resholve ]; - nativeCheckInputs = [ coreutils bats python27 ]; + nativeCheckInputs = [ coreutils bats ]; # LOGLEVEL="DEBUG"; # default path diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 7da12f5b7b642..9b7f2f7432267 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -260,7 +260,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - hash = "sha256-rwpwB+vli3CXRhUFL+UvyUpPlxRk6P/2zLCn0SL9E6s="; + hash = "sha256-ej3h4LlF/pkAYeDxePb7wMc8zrfxKMnrp1ogZLoFU+0="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ @@ -314,10 +314,11 @@ final: prev: { }; }; - teck-programmer = prev.teck-programmer.override { + teck-programmer = prev.teck-programmer.override ({ meta, ... }: { nativeBuildInputs = [ final.node-gyp-build ]; buildInputs = [ pkgs.libusb1 ]; - }; + meta = meta // { license = lib.licenses.gpl3Plus; }; + }); thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override { nativeBuildInputs = [ final.node-pre-gyp ]; @@ -428,5 +429,15 @@ final: prev: { # patch elf is trying to patch binary for sunos rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64 ''; + dependencies = oldAttrs.dependencies ++ lib.optional stdenv.isLinux ({ + name = "_at_cloudflare_slash_workerd-linux-64"; + packageName = "@cloudflare/workerd-linux-64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20231030.0.tgz"; + sha512 = "2HUeRTvoCC17fxE0qdBeR7J9dO8j4A8ZbdcvY8pZxdk+zERU6+N03RTbk/dQMU488PwiDvcC3zZqS4gwLfVT8g=="; + }; + }); }); } diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 5be5f09d19655..fac5789dcdd1a 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,15 +1,11 @@ -{ stdenv +{ buildDunePackage , lib , fetchFromGitHub , which , ocsigen_server -, ocaml , lwt_react -, opaline -, ocamlbuild , ppx_deriving , ppx_optcomp -, findlib , js_of_ocaml-ocamlbuild , js_of_ocaml-ppx , js_of_ocaml-ppx_deriving_json @@ -20,23 +16,19 @@ , ocsipersist }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "eliom"; - version = "10.1.0"; + version = "10.1.2"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-nzrLl8adaRW6c+IQfJ7s+7KtFT8uU27Umyrv0aWXuxw="; + hash = "sha256-Cxwp534ADUO7AHnxZnGsrqxGDkhcJ314M5wytO4e8/0="; }; nativeBuildInputs = [ - ocaml which - findlib - opaline - ocamlbuild ]; buildInputs = [ js_of_ocaml-ocamlbuild @@ -58,12 +50,6 @@ stdenv.mkDerivation rec { strictDeps = true; - installPhase = '' - runHook preInstall - opaline -prefix $out -libdir $OCAMLFIND_DESTDIR - runHook postInstall - ''; - setupHook = [ ./setup-hook.sh ]; meta = { diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix index d0f41d2026898..5c55f2f09bfd1 100644 --- a/pkgs/development/ocaml-modules/gluten/default.nix +++ b/pkgs/development/ocaml-modules/gluten/default.nix @@ -3,25 +3,22 @@ , faraday , fetchurl , lib -, ke }: buildDunePackage rec { pname = "gluten"; - version = "0.3.0"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU="; + hash = "sha256-mGKbbQSPMOumUCtxrAdoBt5y2RrkAf58spkUymTYhYM="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ bigstringaf faraday - ke ]; doCheck = false; # No tests diff --git a/pkgs/development/ocaml-modules/gluten/eio.nix b/pkgs/development/ocaml-modules/gluten/eio.nix new file mode 100644 index 0000000000000..9c78b1d73cd4c --- /dev/null +++ b/pkgs/development/ocaml-modules/gluten/eio.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, gluten, eio }: + +buildDunePackage { + pname = "gluten-eio"; + inherit (gluten) src version; + + propagatedBuildInputs = [ gluten eio ]; + + meta = gluten.meta // { + description = "EIO runtime for gluten"; + }; +} diff --git a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix index cec427c3ad618..c3a360322a14a 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix @@ -9,8 +9,6 @@ buildDunePackage rec { pname = "gluten-lwt-unix"; inherit (gluten) doCheck meta src version; - duneVersion = "3"; - propagatedBuildInputs = [ faraday-lwt-unix gluten-lwt diff --git a/pkgs/development/ocaml-modules/gluten/lwt.nix b/pkgs/development/ocaml-modules/gluten/lwt.nix index cfa736c4bc99d..e4cfb0d8db02a 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt.nix @@ -7,8 +7,6 @@ buildDunePackage rec { pname = "gluten-lwt"; inherit (gluten) doCheck meta src version; - duneVersion = "3"; - propagatedBuildInputs = [ gluten lwt diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index e89ac5aeeef5a..032b080bebd7b 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { pname = "tls"; - version = "0.17.1"; + version = "0.17.3"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; - hash = "sha256-gBDStt4UjaIoaSgYHSM71yD6YPoVez1CULyg3QCMXT8="; + hash = "sha256-R+XezdMO0cNnc2RYpjrgd0dBR7PdZ1wUWQuBqS1QMdQ="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 3aa24ce15e43c..f5e8f0f7af7af 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, fetchFromGitHub }: let - version = "3.3.0alpha3"; + version = "3.3.0"; in buildPecl { inherit version; @@ -11,7 +11,7 @@ in buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-LBrKQCR4qpV3yJpTknUNKX6mq+qSdBSveIoYmk5Vmoc="; + hash = "sha256-i14po+0i25gRR87H6kUdyXF4rXZM70CqXi2EdFBn808="; }; doCheck = true; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 97966e6bb33e6..080717e1a2cce 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.54.0"; + version = "3.56.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-P+f7eBqD0/KIEry/807dQQCvtokB2cYu4i0H6CTYIWg="; + hash = "sha256-PApfNjW7sfVmYT0NcEKs5MZJG65P7WQ5WVpQuOj8EV4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 799c639b85e81..976a0d02fed43 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.78"; + version = "9.2.79"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6WfbfOvF/pL2yG8CdSOPpZ3Bl80U/eo+SFIthTJNeXc="; + hash = "sha256-aMp28g7a44u4VC0g3v9oVhYcBkSZkMJ/83eFTNNBbc0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix index 5775aece8060b..4e5c512a9e242 100644 --- a/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.22"; + version = "0.0.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-d4pyt9+sBPNo/PL05HQ4sjyjubMtTZI9WUGRU1B/dH0="; + hash = "sha256-+kAObq8tbTO6Qlb+/93mF6K+gEHd33TofHug5f+zl+4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 0a2479dd38f43..e69de9cfea339 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -1,26 +1,29 @@ { lib , buildPythonPackage +, docopt , fetchFromGitHub , jsonconversion -, six , pytestCheckHook , pythonOlder +, setuptools +, six +, tabulate }: buildPythonPackage rec { pname = "amazon-ion"; - version = "0.10.0"; - format = "setuptools"; + version = "0.11.2"; + pyproject = true; disabled = pythonOlder "3.7"; - # test vectors require git submodule src = fetchFromGitHub { - owner = "amzn"; + owner = "amazon-ion"; repo = "ion-python"; rev = "refs/tags/v${version}"; + # Test vectors require git submodule fetchSubmodules = true; - hash = "sha256-pCm3jd/dVqO/uIvT5N/w5yoUWU6ni62Pl2A862e+qSk="; + hash = "sha256-0/+bX02qTbOydWDxex4OWL7woP7dW1yJZBmDZAivE7U="; }; postPatch = '' @@ -28,13 +31,19 @@ buildPythonPackage rec { --replace "'pytest-runner'," "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jsonconversion six ]; nativeCheckInputs = [ + docopt pytestCheckHook + tabulate ]; disabledTests = [ @@ -42,13 +51,19 @@ buildPythonPackage rec { "test_roundtrips" ]; + disabledTestPaths = [ + # Exclude benchmarks + "tests/test_benchmark_cli.py" + ]; + pythonImportsCheck = [ "amazon.ion" ]; meta = with lib; { description = "Python implementation of Amazon Ion"; - homepage = "https://github.com/amzn/ion-python"; + homepage = "https://github.com/amazon-ion/ion-python"; + changelog = "https://github.com/amazon-ion/ion-python/releases/tag/v${version}"; sourceProvenance = with sourceTypes; [ fromSource binaryNativeCode diff --git a/pkgs/development/python-modules/anchor-kr/default.nix b/pkgs/development/python-modules/anchor-kr/default.nix new file mode 100644 index 0000000000000..32ce534e6b6b7 --- /dev/null +++ b/pkgs/development/python-modules/anchor-kr/default.nix @@ -0,0 +1,26 @@ +{ lib, + buildPythonPackage, + fetchFromGitHub +}: +buildPythonPackage { + pname = "anchor"; + version = "3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "justfoolingaround"; + repo = "anchor"; + # Using the commit hash because upstream does not have releases. https://github.com/justfoolingaround/anchor/issues/1 + rev = "4cedb6a51877ed3a292cad61eb19013382915e86"; + hash = "sha256-t75IFBSz6ncHRqXRxbrM9EQdr8xPXjSd9di+/y2LegE="; + }; + + pythonImportsCheck = [ "anchor" ]; + + meta = with lib; { + description = "Python library for scraping"; + homepage = "https://github.com/justfoolingaround/anchor"; + license = licenses.unfree; + maintainers = with maintainers; [ passivelemon ]; + }; +} diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 3e877469c1ca5..8ecc9c02c0e18 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.78"; + version = "9.2.79"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-ohmaj5Gp8VXgXJFtg0yx8uHRcCAVm/MaDD9HGfTrtvo="; + hash = "sha256-J5ZjJPX5bL3xuKB9dbSlEvHVQS4XnrQfpZ6IXy/1uMw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/anitopy/default.nix b/pkgs/development/python-modules/anitopy/default.nix new file mode 100644 index 0000000000000..313f9631154e6 --- /dev/null +++ b/pkgs/development/python-modules/anitopy/default.nix @@ -0,0 +1,26 @@ +{ lib, + buildPythonPackage, + fetchFromGitHub +}: +buildPythonPackage rec { + pname = "anitopy"; + version = "2.1.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "igorcmoura"; + repo = "anitopy"; + rev = "v${version}"; + hash = "sha256-xXEf7AJKg7grDmkKfFuC4Fk6QYFJtezClyfA3vq8TfQ="; + }; + + pythonImportsCheck = [ "anitopy" ]; + doCheck = true; + + meta = with lib; { + description = "Python library for parsing anime video filenames"; + homepage = "https://github.com/igorcmoura/anitopy"; + license = licenses.mpl20; + maintainers = with maintainers; [ passivelemon ]; + }; +} diff --git a/pkgs/development/python-modules/approval-utilities/default.nix b/pkgs/development/python-modules/approval-utilities/default.nix index 3b21c3ffab83c..38d22ad57aae4 100644 --- a/pkgs/development/python-modules/approval-utilities/default.nix +++ b/pkgs/development/python-modules/approval-utilities/default.nix @@ -2,18 +2,29 @@ , buildPythonPackage , approvaltests , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "approval-utilities"; inherit (approvaltests) version src; disabled = pythonOlder "3.7"; - format = "setuptools"; + pyproject = true; postPatch = '' mv setup.approval_utilities.py setup.py ''; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + # used in approval_utilities/utilities/time_utilities.py + typing-extensions + ]; + pythonImportsCheck = [ "approval_utilities" ]; # upstream has no tests diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index b8ec645c42d19..289755c5ddc6f 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -5,21 +5,21 @@ , buildPythonPackage , empty-files , fetchFromGitHub -, mock , mrjob , numpy , pyperclip , pytest +, pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , testfixtures -, typing-extensions }: buildPythonPackage rec { pname = "approvaltests"; - version = "10.0.0"; - format = "setuptools"; + version = "10.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,9 +27,13 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-3KorHpJUeWSJKVN/4IN0AqKOIL0sT5MaxkvQqpeilhw="; + hash = "sha256-t+Vxo6Pn3b2H3yAg5LGsGTjrZr4MXeGOY2BF9eFFAdE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ allpairspy approval-utilities @@ -39,16 +43,16 @@ buildPythonPackage rec { pyperclip pytest testfixtures - typing-extensions ]; nativeCheckInputs = [ - mock numpy + pytest-asyncio pytestCheckHook ]; disabledTests = [ + "test_docstrings" # Tests expects paths below ApprovalTests.Python directory "test_received_filename" "test_pytest_namer" diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 725955b78e9da..9e0858f140665 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.78"; + version = "9.2.79"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0OElwNcrywIRS4EjHGS4pQtWOWwPr4Od3wk9yGX1ONA="; + hash = "sha256-7gnNGUxl/K8GWV99uB/dEv9/ukQ4QV4nvyyByobhBt0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index 3810934eefebd..0e0bf1140a64b 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -4,7 +4,6 @@ , hatchling , freezegun , graphql-core -, opentracing , pytest-asyncio , pytest-mock , pytestCheckHook @@ -28,6 +27,9 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; hash = "sha256-v3CaLMTo/zbNEoE3K+aWnFTCgLetcnN7vOU/sFqLq2k="; }; + patches = [ + ./remove-opentracing.patch + ]; nativeBuildInputs = [ hatchling @@ -41,7 +43,6 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - opentracing pytest-asyncio pytest-mock pytestCheckHook @@ -58,12 +59,18 @@ buildPythonPackage rec { "test_attempt_parse_request_missing_content_type_raises_bad_request_error" "test_attempt_parse_non_json_request_raises_bad_request_error" "test_attempt_parse_non_json_request_body_raises_bad_request_error" + # opentracing + "test_query_is_executed_for_multipart_form_request_with_file" + "test_query_is_executed_for_multipart_request_with_large_file_with_tracing" ]; disabledTestPaths = [ # missing graphql-sync-dataloader test dep "tests/test_dataloaders.py" "tests/wsgi/test_configuration.py" + # both include opentracing module, which has been removed from nixpkgs + "tests/tracing/test_opentracing.py" + "tests/tracing/test_opentelemetry.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ariadne/remove-opentracing.patch b/pkgs/development/python-modules/ariadne/remove-opentracing.patch new file mode 100644 index 0000000000000..eecbfafea9b9a --- /dev/null +++ b/pkgs/development/python-modules/ariadne/remove-opentracing.patch @@ -0,0 +1,12 @@ +diff --git a/tests/asgi/conftest.py b/tests/asgi/conftest.py +index a703466..223586e 100644 +--- a/tests/asgi/conftest.py ++++ b/tests/asgi/conftest.py +@@ -8,7 +8,6 @@ from ariadne.asgi.handlers import ( + GraphQLTransportWSHandler, + GraphQLWSHandler, + ) +-from ariadne.contrib.tracing.opentracing import opentracing_extension + + + @pytest.fixture diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix new file mode 100644 index 0000000000000..836bbaf1cd0f5 --- /dev/null +++ b/pkgs/development/python-modules/auditwheel/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools-scm +, pyelftools +, importlib-metadata +, pretend +, pytestCheckHook +# non-python dependencies +, bzip2 +, gnutar +, patchelf +, unzip +}: + +buildPythonPackage rec { + pname = "auditwheel"; + version = "5.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qvgVOreinMmaZjziSYgE2vGIfqG3oyMboNP+5oo8zxk="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + pyelftools + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + nativeCheckInputs = [ + pretend + pytestCheckHook + ]; + + # Integration tests require docker and networking + disabledTestPaths = [ + "tests/integration" + ]; + + # Ensure that there are no undeclared deps + postCheck = '' + PATH= PYTHONPATH= $out/bin/auditwheel --version > /dev/null + ''; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ bzip2 gnutar patchelf unzip ]) + ]; + + meta = with lib; { + changelog = "https://github.com/pypa/auditwheel/blob/${version}/CHANGELOG.md"; + description = "Auditing and relabeling cross-distribution Linux wheels"; + homepage = "https://github.com/pypa/auditwheel"; + license = with licenses; [ + mit # auditwheel and nibabel + bsd2 # from https://github.com/matthew-brett/delocate + bsd3 # from https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py + ]; + mainProgram = "auditwheel"; + maintainers = with maintainers; [ davhau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 3b0cc0eb80308..5d7498c794a96 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.6.0"; + version = "4.6.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "auth0"; repo = "auth0-python"; rev = "refs/tags/${version}"; - hash = "sha256-KNhuonqFt+KrRYctQ426FcnzxISp5sBRs28hFL/Du0Q="; + hash = "sha256-weXEwrOP+TKVwhqCeFVqUw4x+q2Wplr0QWVUzpbNPSc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index e80f521efb2be..605fb0c66df3b 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -1,35 +1,29 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder , stdenv - -# build +, buildPythonPackage , cython -, pkg-config -, setuptools - -# runtime +, fetchFromGitHub , ffmpeg_5-headless - -# tests , numpy , pillow +, pkg-config , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "av"; - version = "10.0.0"; - format = "pyproject"; + version = "11.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mikeboers"; repo = "PyAV"; - rev = "v${version}"; - hash = "sha256-XcHP8RwC2iwD64Jc7SS+t9OxjFTsz3FbrnjMgJnN7Ak="; + rev = "refs/tags/v${version}"; + hash = "sha256-pCKP+4ZmZCJcG7/Qy9H6aS4svQdgaRA9S1QVNWFYhSQ="; }; nativeBuildInputs = [ @@ -53,64 +47,54 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - # Tests that want to download FATE data - # https://github.com/PyAV-Org/PyAV/issues/955 - "--deselect=tests/test_audiofifo.py::TestAudioFifo::test_data" - "--deselect=tests/test_codec_context.py::TestCodecContext::test_codec_tag" - "--deselect=tests/test_codec_context.py::TestCodecContext::test_parse" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_aac" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_dnxhd" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_dvvideo" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_h264" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mjpeg" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mp2" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mpeg1video" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mpeg4" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_pcm_s24le" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_png" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_tiff" - "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_xvid" - "--deselect=tests/test_decode.py::TestDecode::test_decode_audio_sample_count" - "--deselect=tests/test_decode.py::TestDecode::test_decoded_motion_vectors" - "--deselect=tests/test_decode.py::TestDecode::test_decoded_motion_vectors_no_flag" - "--deselect=tests/test_decode.py::TestDecode::test_decoded_time_base" - "--deselect=tests/test_decode.py::TestDecode::test_decoded_video_frame_count" - "--deselect=tests/test_encode.py::TestBasicAudioEncoding::test_transcode" - "--deselect=tests/test_file_probing.py::TestAudioProbe::test_container_probing" - "--deselect=tests/test_file_probing.py::TestAudioProbe::test_stream_probing" - "--deselect=tests/test_file_probing.py::TestDataProbe::test_container_probing" - "--deselect=tests/test_file_probing.py::TestDataProbe::test_stream_probing" - "--deselect=tests/test_file_probing.py::TestSubtitleProbe::test_container_probing" - "--deselect=tests/test_file_probing.py::TestSubtitleProbe::test_stream_probing" - "--deselect=tests/test_file_probing.py::TestVideoProbe::test_container_probing" - "--deselect=tests/test_file_probing.py::TestVideoProbe::test_stream_probing" - "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_buffer" - "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_buffer_no_see" - "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_file" - "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_pipe_readonly" - "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_write_readonl" - "--deselect=tests/test_seek.py::TestSeek::test_decode_half" - "--deselect=tests/test_seek.py::TestSeek::test_seek_end" - "--deselect=tests/test_seek.py::TestSeek::test_seek_float" - "--deselect=tests/test_seek.py::TestSeek::test_seek_int64" - "--deselect=tests/test_seek.py::TestSeek::test_seek_middle" - "--deselect=tests/test_seek.py::TestSeek::test_seek_start" - "--deselect=tests/test_seek.py::TestSeek::test_stream_seek" - "--deselect=tests/test_streams.py::TestStreams::test_selection" - "--deselect=tests/test_streams.py::TestStreams::test_stream_tuples" - "--deselect=tests/test_subtitles.py::TestSubtitle::test_movtext" - "--deselect=tests/test_subtitles.py::TestSubtitle::test_vobsub" - "--deselect=tests/test_videoframe.py::TestVideoFrameImage::test_roundtrip" - ] ++ lib.optionals (stdenv.isDarwin) [ - # Segmentation Faults - "--deselect=tests/test_encode.py::TestBasicVideoEncoding::test_encoding_with_pts" - "--deselect=tests/test_pyav.py::test_bayer_write" - ]; - disabledTests = [ # urlopen fails during DNS resolution "test_writing_to_custom_io" + "test_decode_close_then_use" + # Tests that want to download FATE data, https://github.com/PyAV-Org/PyAV/issues/955 + "test_vobsub" + "test_transcode" + "test_stream_tuples" + "test_stream_seek" + "test_stream_probing" + "test_seek_start" + "test_seek_middle" + "test_seek_int64" + "test_seek_float" + "test_seek_end" + "test_roundtrip" + "test_reading_from_write_readonl" + "test_reading_from_pipe_readonly" + "test_reading_from_file" + "test_reading_from_buffer" + "test_reading_from_buffer_no_see" + "test_parse" + "test_movtext" + "test_encoding_xvid" + "test_encoding_tiff" + "test_encoding_png" + "test_encoding_pcm_s24le" + "test_encoding_mpeg4" + "test_encoding_mpeg1video" + "test_encoding_mp2" + "test_encoding_mjpeg" + "test_encoding_h264" + "test_encoding_dvvideo" + "test_encoding_dnxhd" + "test_encoding_aac" + "test_decoded_video_frame_count" + "test_decoded_time_base" + "test_decoded_motion_vectors" + "test_decode_half" + "test_decode_audio_sample_count" + "test_data" + "test_container_probing" + "test_codec_tag" + "test_selection" + ] ++ lib.optionals (stdenv.isDarwin) [ + # Segmentation Faults + "test_encoding_with_pts" + "test_bayer_write" ]; disabledTestPaths = [ @@ -148,6 +132,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic bindings for FFmpeg/Libav"; homepage = "https://github.com/mikeboers/PyAV/"; + changelog = "https://github.com/PyAV-Org/PyAV/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix new file mode 100644 index 0000000000000..5fba9f0f02dc9 --- /dev/null +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fonttools +, protobuf +, pythonRelaxDepsHook +, pytestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "axisregistry"; + version = "0.4.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-elQUcl6Zh/3xXLduFKbiXZ6uQsDE8C6M3QnTEwaJlaA="; + }; + + propagatedBuildInputs = [ + fonttools + protobuf + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools-scm + ]; + + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Relax the dependency on protobuf 3. Other packages in the Google Fonts + # ecosystem have begun upgrading from protobuf 3 to protobuf 4, + # so we need to use protobuf 4 here as well to avoid a conflict + # in the closure of fontbakery. It seems to be compatible enough. + pythonRelaxDeps = [ "protobuf" ]; + + meta = with lib; { + description = "Google Fonts registry of OpenType variation axis tags"; + homepage = "https://github.com/googlefonts/axisregistry"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 624ce81e5bcaf..add836eee03f4 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -1,11 +1,11 @@ { lib -, azure-common -, azure-mgmt-core , buildPythonPackage , fetchPypi -, isodate -, msal , pythonOlder +, azure-core +, cryptography +, msal +, msal-extensions }: buildPythonPackage rec { @@ -21,10 +21,10 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - azure-common - azure-mgmt-core - isodate + azure-core + cryptography msal + msal-extensions ]; pythonImportsCheck = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Identity Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-identity_${version}/sdk/keyvault/azure-mgmt-keyvault/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-identity_${version}/sdk/identity/azure-identity/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix new file mode 100644 index 0000000000000..4cd3e809a8903 --- /dev/null +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cu2qu +, defcon +, fontfeatures +, fonttools +, glyphslib +, openstep-plist +, orjson +, poetry-core +, pytestCheckHook +, ufoLib2 +}: + +buildPythonPackage rec { + pname = "babelfont"; + version = "3.0.1"; + + # PyPI source tarballs omit tests, fetch from Github instead + src = fetchFromGitHub { + owner = "simoncozens"; + repo = pname; + rev = "v${version}"; + hash = "sha256-1DHcJDVaCgIAODyf5UUrXej8x3ySD4+6/KtxuF2yFV4="; + }; + + pyproject = true; + + propagatedBuildInputs = [ + cu2qu + fontfeatures + fonttools + glyphslib + openstep-plist + orjson + ufoLib2 + ]; + nativeBuildInputs = [ + poetry-core + ]; + + doCheck = true; + nativeCheckInputs = [ + defcon + pytestCheckHook + ]; + + meta = with lib; { + description = "Python library to load, examine, and save fonts in a variety of formats"; + homepage = "https://github.com/simoncozens/babelfont"; + license = licenses.bsd3; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 669f997f6e86c..ea57e4887bff9 100644 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "backports-entry-points-selectable"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "backports.entry_points_selectable"; inherit version; - hash = "sha256-Rwb1kXllfKfB0yWlQ+4TcPj0YzH0MrysYvqyQv3wr6U="; + hash = "sha256-F6i0SucA+6VIaG3SdN3JHAYDcVZc1jgGwgodM5EXRuY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 6de1933fca8d3..f17fabec994f3 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -9,6 +9,7 @@ , jinja2 , isort , python +, pydantic , pytestCheckHook , pytest-asyncio , pytest-mock @@ -18,15 +19,15 @@ buildPythonPackage rec { pname = "betterproto"; - version = "2.0.0b5"; + version = "2.0.0b6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "danielgtaylor"; repo = "python-betterproto"; - rev = "v${version}"; - hash = "sha256-XyXdpo3Yo4aO1favMWC7i9utz4fNDbKbsnYXJW0b7Gc="; + rev = "v.${version}"; + hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI="; }; nativeBuildInputs = [ poetry-core ]; @@ -45,6 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "betterproto" ]; nativeCheckInputs = [ + pydantic pytestCheckHook pytest-asyncio pytest-mock @@ -56,6 +58,7 @@ buildPythonPackage rec { # the protoc-gen-python_betterproto script from the package to be on PATH. preCheck = '' export PATH=$PATH:$out/bin + patchShebangs src/betterproto/plugin/main.py ${python.interpreter} -m tests.generate ''; diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix new file mode 100644 index 0000000000000..0bfb5eeb29ee7 --- /dev/null +++ b/pkgs/development/python-modules/beziers/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, dotmap +, matplotlib +, pyclipper +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "beziers"; + version = "0.5.0"; + + # PyPI doesn't have a proper source tarball, fetch from Github instead + src = fetchFromGitHub { + owner = "simoncozens"; + repo = "beziers.py"; + rev = "v${version}"; + hash = "sha256-4014u7s47Tfdpa2Q9hKAoHg7Ebcs1/DVW5TpEmoh2bc="; + }; + + propagatedBuildInputs = [ + pyclipper + ]; + + doCheck = true; + nativeCheckInputs = [ + dotmap + matplotlib + unittestCheckHook + ]; + unittestFlagsArray = [ "-s" "test" "-v" ]; + + meta = with lib; { + description = "Python library for manipulating Bezier curves and paths in fonts"; + homepage = "https://github.com/simoncozens/beziers.py"; + license = licenses.mit; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 76890aeda2865..52cc36e989cc4 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "black"; - version = "23.9.1"; + version = "23.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-JLaz/1xtnqCKiIj2l36uhY4fNA1yYM9W1wpJgjI2ti0="; + hash = "sha256-TGiFWCX/Qy0ZcimEb5cbxNZmbOkEkuWwIBO8rKTZqwU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blockfrost-python/default.nix b/pkgs/development/python-modules/blockfrost-python/default.nix index 043384e80bf0e..a8da8d6e45cb6 100644 --- a/pkgs/development/python-modules/blockfrost-python/default.nix +++ b/pkgs/development/python-modules/blockfrost-python/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "blockfrost-python"; - version = "0.5.3"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "blockfrost"; repo = "blockfrost-python"; - rev = "${version}"; - hash = "sha256-mQ8avjyLARJONYn18neCyuHEuv3ySyCNMe+P4+Dlxck="; + rev = "refs/tags/${version}"; + hash = "sha256-mN26QXxizDR+o2V5C2MlqVEbRns1BTmwZdUnnHNcFzw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 0d65528f6dfac..29adc4aa473f6 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.79"; + version = "1.33.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-ZEiLnziQX4pgBBmY+dyUV1QiLZAKM0W0SQWWZ4kMLBc="; + hash = "sha256-9f8WY8hvxlPbFk6zYTH+80sOxa51hPWVZNpuqBA9IPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index 24e3194d80c01..b85870572a4c3 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "cheetah3"; - version = "3.3.2"; + version = "3.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "CheetahTemplate3"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-okQz1wM3k43okKcZDRgHAnn5ScL0Pe1OtUvDBScEamY="; + hash = "sha256-7L3SBMgNOOLAFvQST8I0gFlrya/6Lwp/umzolfJx3t4="; }; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 2588a2fc5b90a..c343f7f3e8723 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.78"; + version = "9.2.79"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-p/wbcrZhBhwF/wHgPYaYq8pdUq0UF5Gs6O2B2e8Sr2Q="; + hash = "sha256-N2w4djqJ9r2inLHwhyqNVUqjrlKVo75BblN5xURkMIc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 0df82db6394f8..ffe235dc0b37d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.78"; + version = "9.2.79"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-M5kSJ70fZscPC/pjKQFvTxAkUV0nhG+Vay/Yxtfs0k0="; + hash = "sha256-HVCKw7L5Y/4TR26mWOZ8lKhWOcq0yQqo2LWKQjVSPX4="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-XrGRiUgv3+cwRQMzcr4p/86XX4Z+6n0mQjMQQKYkj5Y="; + hash = "sha256-Zy62O3Mf9V7aGvQejsv4b6JVrHuDIrrqvTSs7/mVdtY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix index 9a2983aabe8f0..439a6241091c8 100644 --- a/pkgs/development/python-modules/click-help-colors/default.nix +++ b/pkgs/development/python-modules/click-help-colors/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "click-help-colors"; - version = "0.9.2"; + version = "0.9.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dWJF5ULSkia7O8BWv6WIhvISuiuC9OjPX8iEF2rJbXI="; + hash = "sha256-9Mq+Us9VApm4iI9PLuTF81msJ+M7z+TWHbR3haXMk2w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index f2d2cc7ca9766..443d24d3f695c 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, nix-update-script , orjson , pandas , poetry-core @@ -18,8 +17,8 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.11.13.14"; - format = "pyproject"; + version = "2023.11.27.17"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-+hX1msvm4hRl3luhMWgXcmpV2DmGI1oCknSP4QEWtxM="; + hash = "sha256-UDcegRnDtz6LYAN9S8wiW/TCsIsQHr5sSX+chEkeFnw="; }; pythonRelaxDeps = [ @@ -64,7 +63,6 @@ buildPythonPackage rec { pandas ]; }; - updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/collidoscope/default.nix b/pkgs/development/python-modules/collidoscope/default.nix new file mode 100644 index 0000000000000..1398043f6b1ca --- /dev/null +++ b/pkgs/development/python-modules/collidoscope/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, babelfont +, kurbopy +, fonttools +, skia-pathops +, tqdm +, uharfbuzz +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "collidoscope"; + version = "0.6.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-D7MzJ8FZjA/NSXCqCJQ9a02FPPi3t4W0q65wRIDcfSA="; + }; + + propagatedBuildInputs = [ + babelfont + kurbopy + fonttools + skia-pathops + tqdm + uharfbuzz + ]; + + doCheck = true; + nativeCheckInputs = [ + unittestCheckHook + ]; + unittestFlagsArray = [ "-s" "test" "-v" ]; + + meta = with lib; { + description = "Python library to detect glyph collisions in fonts"; + homepage = "https://github.com/googlefonts/collidoscope"; + license = licenses.mit; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/commandlines/default.nix b/pkgs/development/python-modules/commandlines/default.nix new file mode 100644 index 0000000000000..70e37055c4dd0 --- /dev/null +++ b/pkgs/development/python-modules/commandlines/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "commandlines"; + version = "0.4.1"; + + # PyPI source tarballs omit tests, fetch from Github instead + src = fetchFromGitHub { + owner = "chrissimpkins"; + repo = "commandlines"; + rev = "v${version}"; + hash = "sha256-x3iUeOTAaTKNW5Y5foMPMJcWVxu52uYZoY3Hhe3UvQ4="; + }; + + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python library for command line argument parsing"; + homepage = "https://github.com/chrissimpkins/commandlines"; + license = licenses.mit; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/configupdater/default.nix b/pkgs/development/python-modules/configupdater/default.nix index 2a502963c2608..6016a63fbe3df 100644 --- a/pkgs/development/python-modules/configupdater/default.nix +++ b/pkgs/development/python-modules/configupdater/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "configupdater"; - version = "3.1.1"; + version = "3.2"; src = fetchPypi { inherit version; pname = "ConfigUpdater"; - hash = "sha256-RvDHTXPvpyN3Z2S0PJc59oBSSV3T1zQxnB0OtYUR8Vs="; + hash = "sha256-n9rFODHBsGKSm/OYtkm4fKMOfxpzXz+/SCBygEEGMGs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index c8cdc1c6d3d3e..ba89ff24621ae 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.10.3"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "CryptoLyzer"; inherit version; - hash = "sha256-8jpWDd/+eEaAp8L4ySpNK91fma005cPMLgzAsSAIpKg="; + hash = "sha256-XiMkZeIjTAv8F84eutZoezZl4bJ2xqh4uwroDU24jjg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index 54be9191a2590..54c5faf307d28 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.11.0"; + version = "0.12.0"; format = "pyproject"; src = fetchPypi { pname = "CryptoParser"; inherit version; - hash = "sha256-fgPmgZxv/UpaoeBO08xcUbPxmjVV4AUEgivNOvWxd04="; + hash = "sha256-E32fHcuICUMCH5NYT+oFYU7M73bvXb/g1UoJSChzOiA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index f6135ecba7447..3e94238709d56 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -4,9 +4,8 @@ , fetchPypi , isPyPy , python -, openblas , blas -, lapack # build segfaults with 64-bit blas +, lapack , suitesparse , unittestCheckHook , glpk ? null @@ -30,38 +29,29 @@ buildPythonPackage rec { hash = "sha256-NGH6QsGyJAuk2h2YXKc1A5FBV/xMd0FzJ+1tfYWs2+Y="; }; - buildInputs = (if stdenv.isDarwin then [ openblas ] else [ blas lapack ]); - doCheck = !stdenv.isDarwin; + buildInputs = [ blas lapack ]; # similar to Gsl, glpk, fftw there is also a dsdp interface # but dsdp is not yet packaged in nixpkgs - preConfigure = (if stdenv.isDarwin then - '' - export CVXOPT_BLAS_LIB=openblas - export CVXOPT_LAPACK_LIB=openblas - '' - else - '' - export CVXOPT_BLAS_LIB=blas - export CVXOPT_LAPACK_LIB=lapack - '') + - '' - export CVXOPT_BUILD_DSDP=0 - export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib - export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include - '' + lib.optionalString withGsl '' - export CVXOPT_BUILD_GSL=1 - export CVXOPT_GSL_LIB_DIR=${lib.getLib gsl}/lib - export CVXOPT_GSL_INC_DIR=${lib.getDev gsl}/include - '' + lib.optionalString withGlpk '' - export CVXOPT_BUILD_GLPK=1 - export CVXOPT_GLPK_LIB_DIR=${lib.getLib glpk}/lib - export CVXOPT_GLPK_INC_DIR=${lib.getDev glpk}/include - '' + lib.optionalString withFftw '' - export CVXOPT_BUILD_FFTW=1 - export CVXOPT_FFTW_LIB_DIR=${lib.getLib fftw}/lib - export CVXOPT_FFTW_INC_DIR=${lib.getDev fftw}/include - ''; + env = { + CVXOPT_BLAS_LIB = "blas"; + CVXOPT_LAPACK_LIB = "lapack"; + CVXOPT_BUILD_DSDP = "0"; + CVXOPT_SUITESPARSE_LIB_DIR = "${lib.getLib suitesparse}/lib"; + CVXOPT_SUITESPARSE_INC_DIR = "${lib.getDev suitesparse}/include"; + } // lib.optionalAttrs withGsl { + CVXOPT_BUILD_GSL = "1"; + CVXOPT_GSL_LIB_DIR= "${lib.getLib gsl}/lib"; + CVXOPT_GSL_INC_DIR= "${lib.getDev gsl}/include"; + } // lib.optionalAttrs withGlpk { + CVXOPT_BUILD_GLPK = "1"; + CVXOPT_GLPK_LIB_DIR = "${lib.getLib glpk}/lib"; + CVXOPT_GLPK_INC_DIR = "${lib.getDev glpk}/include"; + } // lib.optionalAttrs withFftw { + CVXOPT_BUILD_FFTW = "1"; + CVXOPT_FFTW_LIB_DIR = "${lib.getLib fftw}/lib"; + CVXOPT_FFTW_INC_DIR = "${lib.getDev fftw}/include"; + }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index e8b27794ae466..ef2dd6073da0d 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.15.10"; + version = "6.15.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cx_Freeze"; inherit version; - hash = "sha256-Bc0md1lpL1EYYdIoYNNeKgW/v3OPliwVdhi7jHcdIyA="; + hash = "sha256-xf5Ez5eC+qXAaMoc1d6RPv4PmY1ry82oQ9aGod+W7lY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 4e0357ddd8233..dd5cfe0d29811 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "dask-glm"; - version = "0.3.0"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ddaYNBUlvsMzrku7fKrlozRmjshVbQ9yrYIlaRBQCp4="; + hash = "sha256-yUelZoZmmKAdeZeK5zIzy16DitXq1ghRQ1gsXpMLmko="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index 3eeac2e85b9bb..3253ff91c096d 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -23,7 +23,7 @@ let in buildPythonPackage rec { pname = "dataprep-ml"; - version = "0.0.18"; + version = "0.0.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dataprep_ml"; inherit version; - hash = "sha256-nIqyRwv62j8x5Fy7ILMLWxw6yJmkkNRE1zyUlfvRYTI="; + hash = "sha256-X6mTTj4hfnqiCPMFrc8ESFp2E7bRNELLR1uL/dGzsPg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix index bc674c3bf6f00..ab0e1f01ffdc0 100644 --- a/pkgs/development/python-modules/deepl/default.nix +++ b/pkgs/development/python-modules/deepl/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.15.0"; + version = "1.16.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-BRFC4R5d1gxHyEJI41Fi0Az8GqmDG7mQ6Fx/o23OGcE="; + hash = "sha256-s01KhkTJ5ip6nCSs/oCgdxe9Cjsr53tjOhDV1P50jc0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/development/python-modules/dehinter/default.nix new file mode 100644 index 0000000000000..30eae79427654 --- /dev/null +++ b/pkgs/development/python-modules/dehinter/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fonttools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dehinter"; + version = "4.0.0"; + + # PyPI source tarballs omit tests, fetch from Github instead + src = fetchFromGitHub { + owner = "source-foundry"; + repo = "dehinter"; + rev = "v${version}"; + hash = "sha256-l988SW6OWKXzJK0WGAJZR/QDFvgnSir+5TwMMvFcOxg="; + }; + + propagatedBuildInputs = [ + fonttools + ]; + + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Utility for removing hinting data from TrueType and OpenType fonts"; + homepage = "https://github.com/source-foundry/dehinter"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index 26e0b58e7e215..8d4a71e89098d 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "diffsync"; - version = "1.9.0"; + version = "1.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; rev = "refs/tags/v${version}"; - hash = "sha256-OopWzb02/xvASTuvg3dDTEoRwOwKOL0c3arqlsXBUuo="; + hash = "sha256-p7aML6dTDkF4hx67bwI29nhEHi7LIEZ5RlHPgtyQMbo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index dcbcede305631..9cfb6493e577c 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-filter"; - version = "23.3"; + version = "23.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-AV/hVVguGAW0Bik0Tkps88xARQgn0pTQQLS4wXSan6Y="; + hash = "sha256-vtBws4NZ3OfS2+BXsWXVl3MFeYY1bLgJ3tmDs2x3qXY="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 5832d9a069338..60e04b184e9fa 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.4.2"; + version = "3.4.3"; format = "setuptools"; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-E5gM/5MIB65gdyv/I+Kuw8rbjPvtUnbCPXpasaIDzyo="; + hash = "sha256-D9IyuM+ZsvFZL0nhMt1VQ1DYcKg4CS8FPAgSWLtsXeE="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-4ZVb+V/oYfflIZdme6hbpoSBFVV7lk5wLfEzzBqZv/Y="; + hash = "sha256-X3bJ6STFq6zGIzXHSd2C67d4kSOVJJR5aBSM3o5T850="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 5f68c82b1f566..33e74e3c70f81 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "3.3.1"; + version = "3.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9eFBFTx+M28tbIKflldvDJW1po5ht/5FBX5ImfHGFuk="; + hash = "sha256-pV8esZBK1ne2Cl0NBejEi2wLu7HbqTnKG16MU/gl4Ig="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 526a18136a768..799409f619665 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "5.0.2"; + version = "6.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qzq3ZF5nTfaCwRRqW936UVGxt7576SEIcsMVa9g2qtQ="; + hash = "sha256-AjM0Ht3MGd5E9GPdPlPIfvncxRn8dKmZEc6+m1gZdUk="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index e5b9c164b1efc..0be46cc32a5c4 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.8.1"; + version = "2.9.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rabw6FIoSg9Cj4+tRO3BmBAeo9yr8KwU5xTPFL0JkOs="; + hash = "sha256-qrAEBAMbw96TCS6J50RG/2fV9K2WhuXyAQevL4RSQhk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 0ea8de9a4c7c0..ed4f7a9162a73 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "5.0b1"; + version = "5.0rc1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-yIY15zPwoO9GwhljXiHI9ZeOsqFMORgiRlRUG8XVcDA="; + hash = "sha256-pLt3plnaAyt0GpXcuVeGTzaVJ10dWB73Y3IUMA+qrzA="; }; patches = [ diff --git a/pkgs/development/python-modules/downloader-cli/default.nix b/pkgs/development/python-modules/downloader-cli/default.nix index 40cfd888a5d41..e6334daff641e 100644 --- a/pkgs/development/python-modules/downloader-cli/default.nix +++ b/pkgs/development/python-modules/downloader-cli/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "downloader-cli"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "deepjyoti30"; - repo = pname; - rev = version; - hash = "sha256-Dl5XIvdZInz+edL9uQv7V6Kc6FB+7hFAGe/nybnqvQU="; + repo = "downloader-cli"; + rev = "refs/tags/${version}"; + hash = "sha256-E2K3n9qCQofm4gXu1l7/0iMoJsniuzhsBUplr4aZ39s="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Downloader with an awesome customizable progressbar"; homepage = "https://github.com/deepjyoti30/downloader-cli"; + changelog = "https://github.com/deepjyoti30/downloader-cli/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ j0hax ]; }; diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 913e069f4fbef..cf51ddb6b3763 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "drms"; - version = "0.6.4"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fH290QRhhglkhkMrpwHUkqVuYvZ6w/MDIYo9V0queVY="; + hash = "sha256-BHWoyjYYxblw5I3ADqXTUzAdntLU28uk/Qv3Zm0arGo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index 053fd6504e416..1e24f91129208 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -7,23 +7,22 @@ , vcrpy , citeproc-py , requests -, six }: buildPythonPackage rec { pname = "duecredit"; - version = "0.9.2"; + version = "0.9.3"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw="; + hash = "sha256-+DeOqQ0R+XUlkuSHySFj2oDZqf85mT64PAi/LtTso3I="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ citeproc-py requests six ]; + propagatedBuildInputs = [ citeproc-py requests ]; nativeCheckInputs = [ pytestCheckHook vcrpy ]; disabledTests = [ "test_import_doi" ]; # tries to access network diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 217782a34e6c6..041d2b1a3db17 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "1.2.0"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kTp0CowXtnLXetcnoCeqlXoadgaQhL5mTYTfq9QLIl8="; + hash = "sha256-30UnTbEHpGSgSGnhml7pXtPDivH9+NO7nvK4jEmRRUA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index 9f17306b7bdc1..57c73ec20ba01 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , zope_interface -, zope_testing +, zope-testing }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a094ed7961a3dd38fcaaa69cf7a58670038acdff186360166d9e3d964b7a7323"; }; - propagatedBuildInputs = [ zope_interface zope_testing ]; + propagatedBuildInputs = [ zope_interface zope-testing ]; # tests fail, see https://hydra.nixos.org/build/4316603/log/raw doCheck = false; diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index e5bdc6571cc9c..6163c7ecc9c75 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "8.9.0"; + version = "8.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZkEK34gfArigMuilsqPuCT/e7eS4FPvwTA9s4EmbdHI="; + sha256 = "sha256-RK9P1/YgCbsZGTtV4cIUO2kyUX5MDsMBB+f/TZaKEn4="; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ]; diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix index 544506efb0d44..22f2830a447ed 100644 --- a/pkgs/development/python-modules/empy/default.nix +++ b/pkgs/development/python-modules/empy/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "empy"; - version = "3.3.4"; + version = "4.0"; src = fetchPypi { inherit pname version; - sha256 = "c6xJeFtgFHnfTqGKfHm8EwSop8NMArlHLPEgauiPAbM="; + sha256 = "sha256-JNmmKyN+G1+c7Lqw6Ta/9zVAJS0R6sb95/62OxSHuOM="; }; pythonImportsCheck = [ "em" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 542c4907a1d4f..fb192e100c5a9 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.16.1"; + version = "0.17.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "nucleic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bXbexHd/SJjfAAREhQ8V4PekI9mle3GcUPjMn0zDAyw="; + hash = "sha256-DYLDQ9QwdK/a8eY0bFX31UNgxm8FUOaeNAnisFcyFNI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index e0a88d607c5b4..7c72732f7499b 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.10.3"; + version = "8.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; rev = "refs/tags/v${version}"; - hash = "sha256-EvE40HLNKYl38PZ2bShAhFCsX3DMYsMmusUTcAql9b4="; + hash = "sha256-VsHpWe37/CZvGm3PqVq4mJCBA9juvOD9FLmDeW8OjiM="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index 642f9c6f86457..c1bee4d060df8 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2311"; + version = "1.3.0.post2312"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-qIH/cn+QdcjfNwvokbkC+euo6RD75DrqJ5Oj6Ji/9cY="; + hash = "sha256-uS0/Y4luCzJ2zJ0dQ84n4AsQXGWxUv/m5/xiJGPTGDI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 50c4f5e968378..0cdcd90cbe87e 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "fake-useragent"; - version = "1.3.0"; - format = "pyproject"; + version = "1.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fake-useragent"; repo = "fake-useragent"; rev = "refs/tags/${version}"; - hash = "sha256-erGX52ipM0scn3snICf6ipjgVbV8/H5xT4GP3AtvOwo="; + hash = "sha256-Jmzq0yIM373bg2T6t0YFymBiH9vSpiCw+UAMfxsMJvY="; }; postPatch = '' @@ -41,6 +41,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "fake_useragent" + ]; + meta = with lib; { description = "Up to date simple useragent faker with real world database"; homepage = "https://github.com/hellysmile/fake-useragent"; diff --git a/pkgs/development/python-modules/farm-haystack/default.nix b/pkgs/development/python-modules/farm-haystack/default.nix index afee9c60f8945..0e4b29f16054e 100644 --- a/pkgs/development/python-modules/farm-haystack/default.nix +++ b/pkgs/development/python-modules/farm-haystack/default.nix @@ -91,14 +91,14 @@ buildPythonPackage rec { pname = "farm-haystack"; - version = "1.22.0"; + version = "1.22.1"; pyproject = true; src = fetchFromGitHub { owner = "deepset-ai"; repo = "haystack"; rev = "refs/tags/v${version}"; - hash = "sha256-0tRgZqySM9vPhs5lar89Gz/G7/YgRuFZosgTdKuGBH0="; + hash = "sha256-zzDcGfyBI4wcny8Bw893zOuAFYgz4tUY8QbwlGfQQ7o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 30f2174ff7da8..84761c3bfa067 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -15,21 +15,16 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; src = fetchFromGitHub { owner = "guillaumekln"; repo = "faster-whisper"; - rev = "refs/tags/v${version}"; - hash = "sha256-kHXX5Z4r7+lFRBtTCsPy9DILwsk3T1mcBzmJnCrKTdk="; + rev = "refs/tags/${version}"; + hash = "sha256-qcpPQv5WoUkT92/TZ+MMq452FgPNcm3ZZ+ZNc0btOGE="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "onnxruntime>=1.14,<2" "onnxruntime" - ''; - propagatedBuildInputs = [ av ctranslate2 @@ -54,7 +49,7 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/v${version}"; + changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/${version}"; description = "Faster Whisper transcription with CTranslate2"; homepage = "https://github.com/guillaumekln/faster-whisper"; license = licenses.mit; diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index f2455cf2161f0..6cf0cd7097abf 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "23.9.16"; + version = "23.11.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fGrefEoyEgJE3danv9hG+Os79ixPzurEzLc3Dnj2M3k="; + hash = "sha256-9mVCJZmjYECi62wYRmyipAl3B1wqyDU/nTSNcA7oc04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch b/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch new file mode 100644 index 0000000000000..c12c85e0de254 --- /dev/null +++ b/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch @@ -0,0 +1,257 @@ +From 001549503eed364d4baaa5804242f67c6236f6c2 Mon Sep 17 00:00:00 2001 +From: Flakebi <flakebi@t-online.de> +Date: Sat, 2 Dec 2023 16:55:05 +0100 +Subject: [PATCH] Fix with new dependency versions + +- cookie_jar is private in werkzeug 2.3, so recreate the client instead +- set_cookie does not take a hostname argument anymore, use domain instead +- Headers need to specify a content type +--- + test_seasurf.py | 63 ++++++++++++++++++++++++------------------------- + 1 file changed, 31 insertions(+), 32 deletions(-) + +diff --git a/test_seasurf.py b/test_seasurf.py +index 517b2d7..501f82d 100644 +--- a/test_seasurf.py ++++ b/test_seasurf.py +@@ -71,18 +71,18 @@ class SeaSurfTestCase(BaseTestCase): + self.assertEqual(type(token), str) + + def test_exempt_view(self): +- rv = self.app.test_client().post('/foo') ++ rv = self.app.test_client().post('/foo', content_type='application/json') + self.assertIn(b('bar'), rv.data) + +- rv = self.app.test_client().post(u'/foo/\xf8') ++ rv = self.app.test_client().post(u'/foo/\xf8', content_type='application/json') + self.assertIn(b('bar'), rv.data) + + def test_token_validation(self): + # should produce a logger warning +- rv = self.app.test_client().post('/bar') ++ rv = self.app.test_client().post('/bar', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + +- rv = self.app.test_client().post(u'/bar/\xf8') ++ rv = self.app.test_client().post(u'/bar/\xf8', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + + def test_json_token_validation_bad(self): +@@ -107,7 +107,7 @@ class SeaSurfTestCase(BaseTestCase): + data = {'_csrf_token': token} + with self.app.test_client() as client: + with client.session_transaction() as sess: +- client.set_cookie('www.example.com', self.csrf._csrf_name, token) ++ client.set_cookie(self.csrf._csrf_name, token, domain='www.example.com') + sess[self.csrf._csrf_name] = token + + rv = client.post('/bar', data=data) +@@ -121,7 +121,7 @@ class SeaSurfTestCase(BaseTestCase): + with client.session_transaction() as sess: + token = self.csrf._generate_token() + +- client.set_cookie('www.example.com', self.csrf._csrf_name, token) ++ client.set_cookie(self.csrf._csrf_name, token, domain='www.example.com') + sess[self.csrf._csrf_name] = token + + # once this is reached the session was stored +@@ -144,7 +144,7 @@ class SeaSurfTestCase(BaseTestCase): + with client.session_transaction() as sess: + token = self.csrf._generate_token() + +- client.set_cookie('www.example.com', self.csrf._csrf_name, token) ++ client.set_cookie(self.csrf._csrf_name, token, domain='www.example.com') + sess[self.csrf._csrf_name] = token + + # once this is reached the session was stored +@@ -167,7 +167,7 @@ class SeaSurfTestCase(BaseTestCase): + with client.session_transaction() as sess: + token = self.csrf._generate_token() + +- client.set_cookie('www.example.com', self.csrf._csrf_name, token) ++ client.set_cookie(self.csrf._csrf_name, token, domain='www.example.com') + sess[self.csrf._csrf_name] = token + + rv = client.post('/bar', +@@ -187,10 +187,10 @@ class SeaSurfTestCase(BaseTestCase): + self.csrf._csrf_header_name: token, + } + +- rv = client.post('/bar', headers=headers) ++ rv = client.post('/bar', headers=headers, content_type='application/json') + self.assertEqual(rv.status_code, 200, rv) + +- rv = client.post(u'/bar/\xf8', headers=headers) ++ rv = client.post(u'/bar/\xf8', headers=headers, content_type='application/json') + self.assertEqual(rv.status_code, 200, rv) + + def test_token_in_form_data(self): +@@ -280,14 +280,14 @@ class SeaSurfTestCaseExemptViews(BaseTestCase): + + def test_exempt_view(self): + with self.app.test_client() as c: +- rv = c.post('/foo') ++ rv = c.post('/foo', content_type='application/json') + self.assertIn(b('bar'), rv.data) + cookie = get_cookie(rv, self.csrf._csrf_name) + self.assertEqual(cookie, None) + + def test_token_validation(self): + # should produce a logger warning +- rv = self.app.test_client().post('/bar') ++ rv = self.app.test_client().post('/bar', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + + +@@ -319,18 +319,18 @@ class SeaSurfTestCaseIncludeViews(BaseTestCase): + return 'foo' + + def test_include_view(self): +- rv = self.app.test_client().post('/foo') ++ rv = self.app.test_client().post('/foo', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + +- rv = self.app.test_client().post(u'/foo/\xf8') ++ rv = self.app.test_client().post(u'/foo/\xf8', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + + def test_token_validation(self): + # should produce a logger warning +- rv = self.app.test_client().post('/bar') ++ rv = self.app.test_client().post('/bar', content_type='application/json') + self.assertIn(b('foo'), rv.data) + +- rv = self.app.test_client().post(u'/bar/\xf8') ++ rv = self.app.test_client().post(u'/bar/\xf8', content_type='application/json') + self.assertIn(b('foo'), rv.data) + + +@@ -363,10 +363,10 @@ class SeaSurfTestCaseExemptUrls(BaseTestCase): + return 'foo' + + def test_exempt_view(self): +- rv = self.app.test_client().post('/foo/baz') ++ rv = self.app.test_client().post('/foo/baz', content_type='application/json') + self.assertIn(b('bar'), rv.data) + with self.app.test_client() as c: +- rv = c.post('/foo/quz') ++ rv = c.post('/foo/quz', content_type='application/json') + self.assertIn(b('bar'), rv.data) + cookie = get_cookie(rv, self.csrf._csrf_name) + self.assertEqual(cookie, None) +@@ -374,7 +374,7 @@ class SeaSurfTestCaseExemptUrls(BaseTestCase): + def test_token_validation(self): + with self.app.test_client() as c: + # should produce a logger warning +- rv = c.post('/bar') ++ rv = c.post('/bar', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + cookie = get_cookie(rv, self.csrf._csrf_name) + token = self.csrf._get_token() +@@ -434,7 +434,7 @@ class SeaSurfTestCaseDisableCookie(unittest.TestCase): + + def test_no_csrf_cookie_even_after_manually_validated(self): + with self.app.test_client() as c: +- rv = c.post('/manual') ++ rv = c.post('/manual', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + cookie = get_cookie(rv, self.csrf._csrf_name) + self.assertEqual(cookie, None) +@@ -474,14 +474,14 @@ class SeaSurfTestCaseEnableCookie(unittest.TestCase): + + def test_has_csrf_cookie(self): + with self.app.test_client() as c: +- rv = c.post('/exempt_with_cookie') ++ rv = c.post('/exempt_with_cookie', content_type='application/json') + cookie = get_cookie(rv, self.csrf._csrf_name) + token = self.csrf._get_token() + self.assertEqual(cookie, token) + + def test_has_csrf_cookie_but_doesnt_validate(self): + with self.app.test_client() as c: +- rv = c.post('/exempt_with_cookie') ++ rv = c.post('/exempt_with_cookie', content_type='application/json') + self.assertIn(b('exempt_with_cookie'), rv.data) + cookie = get_cookie(rv, self.csrf._csrf_name) + token = self.csrf._get_token() +@@ -530,7 +530,7 @@ class SeaSurfTestCaseSkipValidation(unittest.TestCase): + + def test_skips_validation(self): + with self.app.test_client() as c: +- rv = c.post('/foo/quz') ++ rv = c.post('/foo/quz', content_type='application/json') + self.assertIn(b('bar'), rv.data) + cookie = get_cookie(rv, self.csrf._csrf_name) + token = self.csrf._get_token() +@@ -538,20 +538,20 @@ class SeaSurfTestCaseSkipValidation(unittest.TestCase): + + def test_enforces_validation_reject(self): + with self.app.test_client() as c: +- rv = c.delete('/foo/baz') ++ rv = c.delete('/foo/baz', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + + def test_enforces_validation_accept(self): + with self.app.test_client() as c: + # GET generates CSRF token + c.get('/foo/baz') +- rv = c.delete('/foo/baz', ++ rv = c.delete('/foo/baz', content_type='application/json', + headers={'X-CSRFToken': self.csrf._get_token()}) + self.assertIn(b('bar'), rv.data) + + def test_manual_validation(self): + with self.app.test_client() as c: +- rv = c.post('/manual') ++ rv = c.post('/manual', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + + +@@ -578,7 +578,7 @@ class SeaSurfTestManualValidation(unittest.TestCase): + + def test_can_manually_validate_exempt_views(self): + with self.app.test_client() as c: +- rv = c.post('/manual') ++ rv = c.post('/manual', content_type='application/json') + self.assertIn(b('403 Forbidden'), rv.data) + cookie = get_cookie(rv, self.csrf._csrf_name) + token = self.csrf._get_token() +@@ -651,7 +651,7 @@ class SeaSurfTestCaseReferer(BaseTestCase): + with client.session_transaction() as sess: + token = self.csrf._generate_token() + +- client.set_cookie('www.example.com', self.csrf._csrf_name, token) ++ client.set_cookie(self.csrf._csrf_name, token, domain='www.example.com') + sess[self.csrf._csrf_name] = token + + # once this is reached the session was stored +@@ -728,8 +728,7 @@ class SeaSurfTestCaseSetCookie(BaseTestCase): + res3.headers.get('Set-Cookie', ''), + 'CSRF cookie always be re-set if a token is requested by the template') + +- client.cookie_jar.clear() +- ++ with self.app.test_client() as client: + res4 = client.get('/foo') + + self.assertIn(self.csrf._csrf_name, +@@ -739,14 +738,14 @@ class SeaSurfTestCaseSetCookie(BaseTestCase): + def test_header_set_on_post(self): + with self.app.test_client() as client: + headers = {} +- res1 = client.post('/bar', headers=headers) ++ res1 = client.post('/bar', headers=headers, content_type='application/json') + self.assertEqual(res1.status_code, 403) + + for cookie in client.cookie_jar: + if cookie.name == self.csrf._csrf_name: + headers[self.csrf._csrf_header_name] = cookie.value + +- res2 = client.post('/bar', headers=headers) ++ res2 = client.post('/bar', headers=headers, content_type='application/json') + self.assertEqual(res2.status_code, 200) + + def test_header_set_cookie_samesite(self): +-- +2.42.0 + diff --git a/pkgs/development/python-modules/flask-seasurf/default.nix b/pkgs/development/python-modules/flask-seasurf/default.nix index 79d024f5b34f0..26dd2d7f5e085 100644 --- a/pkgs/development/python-modules/flask-seasurf/default.nix +++ b/pkgs/development/python-modules/flask-seasurf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, flask, mock, unittestCheckHook }: +{ lib, fetchFromGitHub, fetchpatch, buildPythonPackage, isPy3k, flask, mock, unittestCheckHook }: buildPythonPackage rec { pname = "Flask-SeaSurf"; @@ -12,6 +12,20 @@ buildPythonPackage rec { hash = "sha256-L/ZUEqqHmsyXG5eShcITII36ttwQlZN5GBngo+GcCdw="; }; + patches = [ + # Remove usage of deprecated flask._app_ctx_stack + (fetchpatch { + url = "https://github.com/maxcountryman/flask-seasurf/commit/9039764a4e44aeb1acb6ae7747deb438bee0826b.patch"; + hash = "sha256-bVYzJN6MXzH3fNMknd2bh+04JlPJRkU0cLcWv+Rigqc="; + }) + ./0001-Fix-with-new-dependency-versions.patch + ]; + + postPatch = '' + # Disable some tests, pytest is not supported + sed -i "s#\(\(test_header_set_on_post\|test_https_good_referer\|test_https_referer_check_disabled\)(self):\)#\1\n return#g" test_seasurf.py + ''; + propagatedBuildInputs = [ flask ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/flask-sock/default.nix b/pkgs/development/python-modules/flask-sock/default.nix new file mode 100644 index 0000000000000..36ef8a093e1e3 --- /dev/null +++ b/pkgs/development/python-modules/flask-sock/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pytestCheckHook +, pythonOlder +, fetchFromGitHub +, flask +, setuptools +, simple-websocket +}: + +buildPythonPackage rec { + pname = "flask-sock"; + version = "0.7.0"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "flask-sock"; + rev = "v${version}"; + hash = "sha256-GKfOVdeLPag2IKGCWrMjQp4NTL1/9GiyLhXhf9jQKhQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + flask + simple-websocket + ]; + + pytestFlagsArray = [ + "tests/test_flask_sock.py" + ]; + + pythonImportsCheck = [ "flask_sock" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "WebSocket support for Flask"; + homepage = "https://github.com/miguelgrinberg/flask-sock/"; + changelog = "https://github.com/miguelgrinberg/flask-sock/blob/main/CHANGES.md"; + license = licenses.mit; + maintainers = with maintainers; [ fmhoeger ]; + }; +} diff --git a/pkgs/development/python-modules/flask-themes2/default.nix b/pkgs/development/python-modules/flask-themes2/default.nix index 56c03ca39e0cb..b4cd08bdcf09b 100644 --- a/pkgs/development/python-modules/flask-themes2/default.nix +++ b/pkgs/development/python-modules/flask-themes2/default.nix @@ -1,20 +1,36 @@ -{ lib, fetchPypi, buildPythonPackage, flask, pythonOlder, pytestCheckHook }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, flask +, pytestCheckHook +}: buildPythonPackage rec { pname = "flask-themes2"; - version = "1.0.0"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "Flask-Themes2"; inherit version; - hash = "sha256-0U0cSdBddb9+IG3CU6zUPlxaJhQlxOV6OLgxnNDChy8="; + hash = "sha256-gsMgQQXjhDfQRhm7H0kBy8jKxd75WY+PhHR6Rk/PUPs="; }; - nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ flask ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + flask + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Easily theme your Flask app"; diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix new file mode 100644 index 0000000000000..8a43dd52adea8 --- /dev/null +++ b/pkgs/development/python-modules/font-v/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fonttools +, git +, gitpython +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "font-v"; + version = "2.1.0"; + + # PyPI source tarballs omit tests, fetch from Github instead + src = fetchFromGitHub { + owner = "source-foundry"; + repo = "font-v"; + rev = "v${version}"; + hash = "sha256-ceASyYcNul5aWPAPGajCQrqsQ3bN1sE+nMbCbj7f35w="; + }; + + propagatedBuildInputs = [ + fonttools + gitpython + ]; + + doCheck = true; + nativeCheckInputs = [ + git + pytestCheckHook + ]; + preCheck = '' + # Many tests assume they are running from a git checkout, although they + # don't care which one. Create a dummy git repo to satisfy the tests: + git init -b main + git config user.email test@example.invalid + git config user.name Test + git commit --allow-empty --message 'Dummy commit for tests' + ''; + disabledTests = [ + # These tests assume they are actually running from a font-v git checkout, + # so just skip them: + "test_utilities_get_gitrootpath_function" + ]; + + meta = with lib; { + description = "Python utility for manipulating font version headers"; + homepage = "https://github.com/source-foundry/font-v"; + license = licenses.mit; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/fontawesomefree/default.nix b/pkgs/development/python-modules/fontawesomefree/default.nix index 437259ff6d3e2..dea884ab0b30b 100644 --- a/pkgs/development/python-modules/fontawesomefree/default.nix +++ b/pkgs/development/python-modules/fontawesomefree/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "fontawesomefree"; - version = "6.4.2"; + version = "6.5.1"; format = "wheel"; # they only provide a wheel @@ -13,7 +13,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-zq/378T8Odrf88P/cpinoQlUAxENNz8iRWuxw0q22wI="; + hash = "sha256-jexKLuN7+OUzeeu/DTjO/sTgbHySJ/Wa8527exYygXs="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix new file mode 100644 index 0000000000000..b824ca990b8a6 --- /dev/null +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -0,0 +1,146 @@ +{ lib +, buildPythonPackage +, callPackage +, fetchpatch +, fetchPypi +, axisregistry +, babelfont +, beautifulsoup4 +, beziers +, cmarkgfm +, collidoscope +, defcon +, dehinter +, fonttools +, font-v +, freetype-py +, gflanguages +, git +, glyphsets +, lxml +, installShellFiles +, munkres +, opentypespec +, ots-python +, packaging +, pip-api +, protobuf +, pytestCheckHook +, pytest-xdist +, pythonRelaxDepsHook +, pyyaml +, requests +, requests-mock +, rich +, setuptools-scm +, shaperglot +, stringbrewer +, toml +, unicodedata2 +, ufo2ft +, ufolint +, vharfbuzz +}: + +buildPythonPackage rec { + pname = "fontbakery"; + version = "0.10.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Ye/TMGvURxSU2yoohwYbSo5RvrmbHKdMnFNj2lUvtMk="; + }; + + patches = [ + # Mock HTTP requests in tests (note we still have to skip some below) + # https://github.com/googlefonts/fontbakery/pull/4124 + (fetchpatch { + url = "https://github.com/fonttools/fontbakery/pull/4124.patch"; + hash = "sha256-NXuC2+TtxpHYMdd0t+cF0FJ3lrh4exP5yxspEasKKd0="; + }) + ]; + + propagatedBuildInputs = [ + axisregistry + babelfont + beautifulsoup4 + beziers + cmarkgfm + collidoscope + defcon + dehinter + fonttools + font-v + freetype-py + gflanguages + glyphsets + lxml + munkres + ots-python + opentypespec + packaging + pip-api + protobuf + pyyaml + requests + rich + shaperglot + stringbrewer + toml + ufolint + unicodedata2 + vharfbuzz + ufo2ft + ]; + nativeBuildInputs = [ + installShellFiles + pythonRelaxDepsHook + setuptools-scm + ]; + + pythonRelaxDeps = [ + "collidoscope" + "protobuf" + "vharfbuzz" + ]; + + doCheck = true; + nativeCheckInputs = [ + git + pytestCheckHook + pytest-xdist + requests-mock + ufolint + ]; + preCheck = '' + # Let the tests invoke 'fontbakery' command. + export PATH="$out/bin:$PATH" + # font-v tests assume they are running from a git checkout, although they + # don't care which one. Create a dummy git repo to satisfy the tests: + git init -b main + git config user.email test@example.invalid + git config user.name Test + git commit --allow-empty --message 'Dummy commit for tests' + ''; + disabledTests = [ + # These require network access: + "test_check_vertical_metrics_regressions" + "test_check_cjk_vertical_metrics_regressions" + "test_check_fontbakery_version_live_apis" + ]; + + postInstall = '' + installShellCompletion --bash --name fontbakery \ + snippets/fontbakery.bash-completion + ''; + + passthru.tests.simple = callPackage ./tests.nix { }; + + meta = with lib; { + description = "Tool for checking the quality of font projects"; + homepage = "https://github.com/googlefonts/fontbakery"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/fontbakery/tests.nix b/pkgs/development/python-modules/fontbakery/tests.nix new file mode 100644 index 0000000000000..4725b1fee3e31 --- /dev/null +++ b/pkgs/development/python-modules/fontbakery/tests.nix @@ -0,0 +1,22 @@ +{ runCommand +, fontbakery +}: + +let + inherit (fontbakery) pname version src; +in + +runCommand "${pname}-tests" { meta.timeout = 5; } '' + # Check the version matches what we packaged. + ${fontbakery}/bin/fontbakery --version | grep -q "${version}" + + # Can it list its own subcommands? + ${fontbakery}/bin/fontbakery --list-subcommands >>$out + + # Unpack src to get some test fonts. + tar -xzf ${src} --strip-components=1 ${pname}-${version}/data/test + + # Run some font checks. + ${fontbakery}/bin/fontbakery check-ufo-sources --no-progress --no-colors data/test/test.ufo >>$out + # TODO add more +'' diff --git a/pkgs/development/python-modules/fontfeatures/default.nix b/pkgs/development/python-modules/fontfeatures/default.nix new file mode 100644 index 0000000000000..2ea5247d38c8b --- /dev/null +++ b/pkgs/development/python-modules/fontfeatures/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, beziers +, fonttools +, fs +, glyphtools +, lxml +, pytestCheckHook +, youseedee +}: + +buildPythonPackage rec { + pname = "fontfeatures"; + version = "1.8.0"; + + src = fetchPypi { + pname = "fontFeatures"; + inherit version; + hash = "sha256-XLJD91IyUUjeSqdhWFfIqv9yISPcbU4bgRvXETSHOiY="; + }; + + propagatedBuildInputs = [ + beziers + fonttools + fs + glyphtools + lxml + youseedee + ]; + + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + ]; + disabledTestPaths = [ + # These tests require babelfont but we have to leave it out and skip them + # to break the cyclic dependency with babelfont. + "tests/test_shaping_generic.py" + "tests/test_shaping_harfbuzz.py" + ]; + + meta = with lib; { + description = "Python library for compiling OpenType font features"; + homepage = "https://github.com/simoncozens/fontFeatures"; + license = licenses.bsd3; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 6bd1622fa44d4..7b746f364c982 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.3.9"; + version = "2.3.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Marco-Sulla"; repo = "python-frozendict"; rev = "refs/tags/v${version}"; - hash = "sha256-wVsTsUK6TES6YLGZGcHcGufrdVQrODyXrqczae8iTJ0="; + hash = "sha256-GUpCN5CsCJGuIfdsmgZHQvByA145RLI1l7aVEueqjDM="; }; # build C version if it exists diff --git a/pkgs/development/python-modules/fschat/default.nix b/pkgs/development/python-modules/fschat/default.nix index 573009b2a5ea3..44420ae6c61fb 100644 --- a/pkgs/development/python-modules/fschat/default.nix +++ b/pkgs/development/python-modules/fschat/default.nix @@ -29,7 +29,7 @@ , protobuf }: let - version = "0.2.32"; + version = "0.2.33"; in buildPythonPackage { pname = "fschat"; @@ -40,7 +40,7 @@ buildPythonPackage { owner = "lm-sys"; repo = "FastChat"; rev = "refs/tags/v${version}"; - hash = "sha256-3IJcqVULOK0Nf72sgv80q9U8QZ3pNHLYaNwCQohdBB8="; + hash = "sha256-tfFgiYJBuVt71qHOmkDoSrZ2tvXStjubmkw7sexkGZg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 423cfd34a70f8..90b70e8906c86 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.9"; - format = "pyproject"; + version = "0.2.11"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-wQWOksI0nfzIMdxgZehMmNytuXWD22GLUNoI7Ki0C3s="; + hash = "sha256-T8flktIBRhtXpxd17bqrocncgpIfinMDvVwvaoltZAs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gcodepy/default.nix b/pkgs/development/python-modules/gcodepy/default.nix new file mode 100644 index 0000000000000..51f32d2022414 --- /dev/null +++ b/pkgs/development/python-modules/gcodepy/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +}: + +buildPythonPackage rec { + pname = "gcodepy"; + version = "0.1.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "rmeno12"; + repo = "gcodepy"; + rev = "v${version}"; + hash = "sha256-+amBkwwISPyes8ABdqgCw50Zg5ioDa46WZgQsZZgl+8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "gcodepy" + ]; + + meta = with lib; { + description = "G-code generator for 3D printers that use Marlin Firmware"; + homepage = "https://github.com/rmeno12/gcodepy"; + changelog = "https://github.com/rmeno12/gcodepy/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ n00b0ss ]; + }; +} diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 7e1d88cde5085..93ef732273102 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.23"; + version = "0.5.25"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6Xk7wAF0bZrHriSyDMnPfaPRBiVinHawj3nEqpwbUmo="; + hash = "sha256-VQSefwzw4zA9ycO8723kBlMbtrOJxmKgZ8tfXZmtyQc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 3a25b434c301c..52adbbe07eed2 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "geopy"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3Sq76DcnoG0Uv/KPF/B3oep0MO96vemKiANjgR7/k/I="; + hash = "sha256-mlOXDEtYry1IUAZWrP2FuY/CGliUnCPYLULnLNN0n4Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix new file mode 100644 index 0000000000000..baaeeb6c9339b --- /dev/null +++ b/pkgs/development/python-modules/gflanguages/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, protobuf +, setuptools-scm +, pythonRelaxDepsHook +, pytestCheckHook +, uharfbuzz +, youseedee +}: + +buildPythonPackage rec { + pname = "gflanguages"; + version = "0.5.10"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JVeI7TlJjbKCa+gGmjylbNiEhX3qmpbLXiH3VpFqgXc="; + }; + + propagatedBuildInputs = [ + protobuf + ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + doCheck = true; + nativeCheckInputs = [ + pythonRelaxDepsHook + pytestCheckHook + uharfbuzz + youseedee + ]; + + # Relax the dependency on protobuf 3. Other packages in the Google Fonts + # ecosystem have begun upgrading from protobuf 3 to protobuf 4, + # so we need to use protobuf 4 here as well to avoid a conflict + # in the closure of fontbakery. It seems to be compatible enough. + pythonRelaxDeps = [ "protobuf" ]; + + meta = with lib; { + description = "Python library for Google Fonts language metadata"; + homepage = "https://github.com/googlefonts/lang"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix new file mode 100644 index 0000000000000..85509528bf35b --- /dev/null +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, httpx +, pydantic +, typing-extensions +}: + +buildPythonPackage rec { + pname = "githubkit"; + version = "0.10.7"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sKikL+761mBP7j+qugHKDQ0hVXT51FV8FYbB3ZJtweA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + httpx + pydantic + typing-extensions + ]; + + pythonImportsCheck = [ "githubkit" ]; + + meta = { + description = "GitHub SDK for Python"; + homepage = "https://github.com/yanyongyu/githubkit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kranzes ]; + }; +} diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index db9f369a3497a..d39daf9e9dc26 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -20,10 +20,8 @@ buildPythonPackage rec { }; # Patch path to GLFW shared object - patches = [ ./search-path.patch ]; - postPatch = '' - substituteInPlace glfw/library.py --replace "@GLFW@" '${glfw3}/lib' + substituteInPlace glfw/library.py --replace "_get_library_search_paths()," "[ '${glfw3}/lib' ]," ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glfw/search-path.patch b/pkgs/development/python-modules/glfw/search-path.patch deleted file mode 100644 index 0c4a42ceb3621..0000000000000 --- a/pkgs/development/python-modules/glfw/search-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/glfw/library.py b/glfw/library.py -index 20387e1..9bdd62a 100644 ---- a/glfw/library.py -+++ b/glfw/library.py -@@ -189,5 +189,4 @@ elif sys.platform == 'win32': - except OSError: - pass - else: -- glfw = _load_library(['glfw', 'glfw3'], ['.so', '.dylib'], -- _get_library_search_paths(), _glfw_get_version) -+ glfw = _load_library(['glfw', 'glfw3'], ['.so', '.dylib'], ['@GLFW@'], _glfw_get_version) diff --git a/pkgs/development/python-modules/glyphsets/0001-relax-setuptools-scm-dep.patch b/pkgs/development/python-modules/glyphsets/0001-relax-setuptools-scm-dep.patch new file mode 100644 index 0000000000000..96a4047c5cedf --- /dev/null +++ b/pkgs/development/python-modules/glyphsets/0001-relax-setuptools-scm-dep.patch @@ -0,0 +1,22 @@ +From de2e02a41b11a708d58dfd1e24d335b8882dd7bd Mon Sep 17 00:00:00 2001 +From: Dan Callaghan <djc@djc.id.au> +Date: Sun, 23 Apr 2023 12:15:47 +1000 +Subject: [PATCH] relax setuptools-scm dep + + +diff --git a/setup.py b/setup.py +index 2c122a7..42f9b61 100644 +--- a/setup.py ++++ b/setup.py +@@ -55,7 +55,7 @@ + 'Programming Language :: Python :: 3' + ], + python_requires=">=3.7", +- setup_requires=['setuptools_scm>=4,<6.1'], ++ setup_requires=['setuptools_scm'], + install_requires=[ + 'setuptools', + 'FontTools[ufo]', +-- +2.38.4 + diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix new file mode 100644 index 0000000000000..5088deb580b09 --- /dev/null +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, defcon +, fonttools +, glyphslib +, pytestCheckHook +, setuptools +, setuptools-scm +, unicodedata2 +}: + +buildPythonPackage rec { + pname = "glyphsets"; + version = "0.6.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Zp4VLJ9h6lkz7KOM7LWKAj7UX1KziLobzeT9Dosv5UU="; + }; + + patches = [ + # Upstream has a needlessly strict version range for setuptools_scm, our + # setuptools-scm is newer. We can't use pythonRelaxDepsHook for this + # because it's in setup_requires which means we'll fail the requirement + # before pythonRelaxDepsHook can run. + ./0001-relax-setuptools-scm-dep.patch + ]; + + propagatedBuildInputs = [ + defcon + fonttools + glyphslib + setuptools + unicodedata2 + ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + ]; + preCheck = '' + export PATH="$out/bin:$PATH" + ''; + + meta = with lib; { + description = "Google Fonts glyph set metadata"; + homepage = "https://github.com/googlefonts/glyphsets"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 2a0276a3c7e3a..65cbc5b3b2059 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.4.1"; + version = "6.6.0"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-pDFPn1KDiZ5yw1UzPgi0+Syv3h606bsOOzLbdOiag8s="; + hash = "sha256-2Y7JhaZJXKERQXEI9cDCx7m95El6AicU0t+X3Gntbxk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/glyphtools/default.nix b/pkgs/development/python-modules/glyphtools/default.nix new file mode 100644 index 0000000000000..f186863459a70 --- /dev/null +++ b/pkgs/development/python-modules/glyphtools/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, beziers +, glyphslib +, numpy +, setuptoolsCheckHook +}: + +buildPythonPackage rec { + pname = "glyphtools"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PXwXHWMJbsi6ZtN+daaXAnlw3gV5DFAhyRxdBa7UP+M="; + }; + + propagatedBuildInputs = [ + beziers + glyphslib + numpy + ]; + + # A unit test suite does exist, but it only contains a dummy test that + # doesn't test anything. It does import the module though so we still run it. + doCheck = true; + nativeCheckInputs = [ + # Upstream apparently prefers the deprecated setuptools 'test' command. + setuptoolsCheckHook + ]; + + meta = with lib; { + description = "Python library for extracting information from font glyphs"; + homepage = "https://github.com/simoncozens/glyphtools"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 67d050c2e722d..781218fa7a206 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.33.2"; + version = "0.33.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MPmyvm2FSrUzb1y5i4xl5Cqea6sxixLoZ7V1hxNi7hw="; + hash = "sha256-4sv5wua03gLd9YqwdD8P/VaKv4LcacB42fK5hUAt2vQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix index ea2c09eed4a3e..ce04d7df22737 100644 --- a/pkgs/development/python-modules/gptcache/default.nix +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gptcache"; - version = "0.1.42"; + version = "0.1.43"; format = "setuptools"; disabled = pythonOlder "3.8.1"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "zilliztech"; repo = "GPTCache"; rev = "refs/tags/${version}"; - hash = "sha256-rrPs5ZwBooltVcvrs4AHObx69xmZ8F+IP/lJGPVTNXY="; + hash = "sha256-EDsHzl55j4sehbKk0/be+WOl83f1/7zPLvPyzKnTBP4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index f827c85081220..1063dfdb5d9dd 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.59.2"; + version = "1.59.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-apOnMd8EDU+ocj6fL/dkl3tqh6en/Q8H9K/lgvkqFN8="; + hash = "sha256-R2rk/4yQ0ldy6yZeauVtEpmmF0Jnx61NMw98y3D5kq4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index 4c028e4ec71c1..f758a8bf25046 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.59.0"; + version = "1.59.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-4CIcpupsITlhQXmAi4+LMjA30LG977D8TN2agUmZVx4="; + hash = "sha256-AVAXzkFk/H3Ogdo6FxiksxUyMOSBss3r85JGi2E/B2Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index cd0506870a27f..7ed24e849ccdf 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.59.2"; + version = "1.59.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-l5bcvFnc+59tVGXVnn+mKld3o+TVqolPRIVciWpG+os="; + hash = "sha256-VAPFpzjG7sS7QIDad+RQMS2s5BqG4pKsN8/QB7JlfU4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index f71690c877e22..0e56dd26cb8d4 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.12.0"; + version = "5.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-v6kpje5rw3/OfcoMWdSCZdkmETyIJ08cly8lLUt9j64="; + hash = "sha256-cuSR5QWURHSL1o2R4rc/m3KETz3X+78TC8LuuzZghbs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix index 550e5e9a4626d..71cad63ef70f7 100644 --- a/pkgs/development/python-modules/headerparser/default.nix +++ b/pkgs/development/python-modules/headerparser/default.nix @@ -1,25 +1,26 @@ { lib +, attrs , buildPythonPackage +, deprecated , fetchFromGitHub -, setuptools , pytest-mock , pytestCheckHook , pythonOlder -, six +, setuptools }: buildPythonPackage rec { pname = "headerparser"; - version = "0.4.0"; - format = "pyproject"; + version = "0.5.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jwodder"; - repo = pname; - rev = "v${version}"; - hash = "sha256-KJJt85iC/4oBoIelB2zUJVyHSppFem/22v6F30P5nYM="; + repo = "headerparser"; + rev = "refs/tags/v${version}"; + hash = "sha256-CWXha7BYVO5JFuhWP8OZ95fhUsZ3Jo0cgPAM+O5bfec="; }; nativeBuildInputs = [ @@ -27,7 +28,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - six + attrs + deprecated ]; nativeCheckInputs = [ @@ -35,13 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace tox.ini \ - --replace "--cov=headerparser" "" \ - --replace "--no-cov-on-fail" "" \ - --replace "--flakes" "" - ''; - pythonImportsCheck = [ "headerparser" ]; @@ -49,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to parse key-value pairs in the style of RFC 822 (e-mail) headers"; homepage = "https://github.com/jwodder/headerparser"; + changelog = "https://github.com/wheelodex/headerparser/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ayazhafiz ]; }; diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix new file mode 100644 index 0000000000000..2b99f6bffeee6 --- /dev/null +++ b/pkgs/development/python-modules/html2image/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, requests +, websocket-client +}: + +buildPythonPackage rec { + pname = "html2image"; + version = "2.0.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "vgalin"; + repo = "html2image"; + rev = version; + hash = "sha256-BDl2Kibp1WOAOYNlXa2aaEgQTitk+OZu72OgytciZYI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + requests + websocket-client + ]; + + pythonImportsCheck = [ "html2image" ]; + + meta = with lib; { + description = "A package acting as a wrapper around the headless mode of existing web browsers to generate images from URLs and from HTML+CSS strings or files"; + homepage = "https://github.com/vgalin/html2image"; + changelog = "https://github.com/vgalin/html2image/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 561c9c97f4955..67f05cb8e7f63 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.11"; + version = "0.4.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kovidgoyal"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-l7cCt+zX+qOujS6noc1/p7mELqrHae3eiKQNXBxLm7o="; + hash = "sha256-0Qn+To/d3+HMx+KhhgJBEHVYPOfIeBnngBraY7r4uSs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 6c6e7983b7c33..5b78404f8fba4 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "i-pi"; - version = "2.4.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "i-pi"; repo = "i-pi"; - rev = "v${version}"; - sha256 = "0d0ag57aa0fsqjwya27fyj8alimjvlxzgh6hxjqy1k4ap9h3n1cy"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-c1bs8ZI/dfDwKx5Df8ndtsDxESQrdbMkvrjfI6b9JTg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 76e1814dddddb..e525cf89cca2e 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "icontract"; - version = "2.6.4"; + version = "2.6.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Parquery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zuaS9mmq47hUIBObYRuzEYQQdTArFXR3TpK9nfZt/yk="; + hash = "sha256-R5/FBfuTvXItfTlNZMSnO18Q+etnHbQyXFWpaOpOLes="; }; preCheck = '' diff --git a/pkgs/development/python-modules/id/default.nix b/pkgs/development/python-modules/id/default.nix new file mode 100644 index 0000000000000..c4b59268b4bcc --- /dev/null +++ b/pkgs/development/python-modules/id/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pretend +, pydantic +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "id"; + version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "di"; + repo = "id"; + rev = "refs/tags/v${version}"; + hash = "sha256-T3p13EnXU1Efysnu1RQw5st1BgHyZNdrKtkzQSguRtM="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + pydantic + requests + ]; + + nativeCheckInputs = [ + pretend + pytestCheckHook + ]; + + pythonImportsCheck = [ + "id" + ]; + + meta = with lib; { + description = "A tool for generating OIDC identities"; + homepage = "https://github.com/di/id"; + changelog = "https://github.com/di/id/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix index 58c45f9922361..6301970392ac9 100644 --- a/pkgs/development/python-modules/imapclient/default.nix +++ b/pkgs/development/python-modules/imapclient/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imapclient"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "mjs"; repo = "imapclient"; rev = "refs/tags/${version}"; - hash = "sha256-ylYGh+78I+6pdvHuQPw8Gks9TLkXQL5HQiaZDnJK3DA="; + hash = "sha256-WY3OLPUwixrL2NSLfNBSSNMXJEoYBL+O6KoglU3Cz9g="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 1d13d50804af0..8ca4ed136fe98 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "inquirer"; - version = "3.1.3"; + version = "3.1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "magmax"; repo = "python-inquirer"; rev = "refs/tags/v${version}"; - hash = "sha256-7GfHsCQgnDUdiM1z9YNdDuwMNy6rLjR1UTnZMgpQ5k4="; + hash = "sha256-1xaxLIk4GFRpcodhBX+Co9TgpYkWhB/D4OE4Nny4ijM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index ff7dad6f0be0a..8c7a9f69d50e9 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "3.1.30"; + version = "3.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CIcudKyRPVJX6QvWk6dBbYnO5EULREDhaflJTAfJEvc="; + hash = "sha256-lbBQbcVhozca7gYkeUFClS+5WaPaTajQMdfqDL07xdk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 74cb52629af53..d1b970c34a2eb 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.25.2"; - format = "pyproject"; + version = "6.27.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9Gjd0fF6y0jIzmf8+km6bUbU+awEOMH0Qb58PRNyIws="; + hash = "sha256-fV1ZS2aQZUtNKZ7bpehy3Be7c5ao0GCcl8t7ihxgXeY="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "IPython Kernel for Jupyter"; homepage = "https://ipython.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ] ++ lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index edbb13912ad95..0de6d2feb4aef 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -5,9 +5,10 @@ , flaky , ipykernel , ipyparallel -, nose +, pre-commit , pytestCheckHook - +, pytest-asyncio +, pytest-timeout }: buildPythonPackage { @@ -22,15 +23,26 @@ buildPythonPackage { flaky ipykernel ipyparallel - nose + pre-commit pytestCheckHook + pytest-asyncio + pytest-timeout ]; preCheck = '' export HOME=$(mktemp -d) ''; - disabledTests = lib.optionals stdenv.isDarwin ([ + disabledTests = [ # The follwing three tests fail for unclear reasons. + # pytest.PytestUnhandledThreadExceptionWarning: Exception in thread Thread-8 + "test_asyncio_interrupt" + + # DeprecationWarning: Passing unrecognized arguments to super(IPythonKernel) + "test_embed_kernel_func" + + # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin... + "test_install_kernelspec" + ] ++ lib.optionals stdenv.isDarwin ([ # see https://github.com/NixOS/nixpkgs/issues/76197 "test_subprocess_print" "test_subprocess_error" diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 4030bd5e4041d..d80cbc2a60183 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -34,11 +34,7 @@ let inherit (cudaPackages) cudatoolkit cudnn; -in - -assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux; -let version = "0.4.20"; inherit (python) pythonVersion; @@ -213,5 +209,9 @@ buildPythonPackage { license = licenses.asl20; maintainers = with maintainers; [ samuela ]; platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; + broken = + !(cudaSupport -> (cudaPackages ? cudatoolkit) && lib.versionAtLeast cudatoolkit.version "11.1") + || !(cudaSupport -> (cudaPackages ? cudnn) && lib.versionAtLeast cudnn.version "8.2") + || !(cudaSupport -> stdenv.isLinux); }; } diff --git a/pkgs/development/python-modules/jplephem/default.nix b/pkgs/development/python-modules/jplephem/default.nix index d945d9c11c560..017d8bda66522 100644 --- a/pkgs/development/python-modules/jplephem/default.nix +++ b/pkgs/development/python-modules/jplephem/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jplephem"; - version = "2.20"; + version = "2.21"; src = fetchPypi { inherit pname version; - hash = "sha256-u5htUI6kbGiTaomWiaZE21+grznJpQRCIImgA+yg4fo="; + hash = "sha256-NBlLYQaV8huJIXuYUrjautvOgISMs2nZVn7xLcSCjVU="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 6261303981217..5f298922cfe6f 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -205,6 +205,7 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; + maintainers = teams.jupyter.members; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 1905434759a2b..28df79fb99985 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -3,7 +3,9 @@ , buildPythonPackage , fetchPypi , pythonOlder +, installShellFiles , setuptools-scm +, shtab , importlib-metadata , dbus-python , jaraco-classes @@ -14,17 +16,19 @@ buildPythonPackage rec { pname = "keyring"; - version = "24.2.0"; - format = "pyproject"; + version = "24.3.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ygdGoZ7EISGfTXE/hI+il6ZhqKjBUEhn5Vv7XgkJFQk="; + hash = "sha256-5zDs/9MJZYoI7oJTWjtexLTIZpqb4R77ZiSdjgrrmiU="; }; nativeBuildInputs = [ + installShellFiles setuptools-scm + shtab ]; propagatedBuildInputs = [ @@ -36,6 +40,12 @@ buildPythonPackage rec { importlib-metadata ]; + postInstall = '' + installShellCompletion --cmd keyring \ + --bash <($out/bin/keyring --print-completion bash) \ + --zsh <($out/bin/keyring --print-completion zsh) + ''; + pythonImportsCheck = [ "keyring" "keyring.backend" @@ -56,6 +66,7 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/keyring"; changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst"; license = licenses.mit; + mainProgram = "keyring"; maintainers = with maintainers; [ lovek323 dotlambda ]; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix new file mode 100644 index 0000000000000..aa5e33f237577 --- /dev/null +++ b/pkgs/development/python-modules/kurbopy/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fonttools +, pytestCheckHook +, python +, rustPlatform +, unzip +}: + +buildPythonPackage rec { + pname = "kurbopy"; + version = "0.10.40"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dhpcDi20Na6SDbRxrC8N3SWdN1J/CWJgCUI3scJX/6s="; + }; + + propagatedBuildInputs = [ + fonttools + ]; + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-V3LeT0dqkfft1ftc+azwvuSzzdUJ7/wAp31fN7te9RQ="; + }; + + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + ]; + preCheck = '' + # pytestCheckHook puts . at the front of Python's sys.path, due to: + # https://github.com/NixOS/nixpkgs/issues/255262 + # So we need to prevent pytest from trying to import kurbopy from + # ./kurbopy, which contains the sources but not the newly built module. + # We want it to import kurbopy from the nix store via $PYTHONPATH instead. + rm -r kurbopy + ''; + + meta = with lib; { + description = "Python wrapper around the Rust kurbo library for 2D curve manipulation"; + homepage = "https://github.com/simoncozens/kurbopy"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 3b81c6128887f..78337124ca8f5 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.63"; + version = "0.0.69"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-KE+WMnuWAq1stZuuwZkOPOKQ2lZNKtxzNbZMRoOdmz0="; + hash = "sha256-LP97bGCmLw2uFcFdFcDWM7hSuki7r7T6WFHI6i3rF34="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/latexify-py/default.nix b/pkgs/development/python-modules/latexify-py/default.nix index f56055e55fd78..ccda72eb03d7f 100644 --- a/pkgs/development/python-modules/latexify-py/default.nix +++ b/pkgs/development/python-modules/latexify-py/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "latexify-py"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "google"; repo = "latexify_py"; rev = "refs/tags/v${version}"; - hash = "sha256-sxXfm4zJJT+94jcSsYH7Ky3XwFOniSNxvcVUAsgz8u0="; + hash = "sha256-bBtAtBJfpStNYWhOJoypDI9hhE4g1ZFHBU8p6S1yCgU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index bd95899398f8e..71443bb0144a1 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "license-expression"; - version = "30.1.1"; - format = "setuptools"; + version = "30.2.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nexB"; repo = "license-expression"; rev = "refs/tags/v${version}"; - hash = "sha256-5pRfFRQLxWmhEKoJZiC7gZbmW8BbqBNBWbdwFL0MtpM="; + hash = "sha256-vsQsHi2jdB0OiV6stm1APjQvr+238UoKgaaeXVx/isI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index ef70a50f70d1c..d25adcdf65c09 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -6,9 +6,16 @@ , openai , python-dotenv , tiktoken +, tokenizers +, click +, jinja2 +, certifi +, appdirs +, aiohttp +, httpx }: let - version = "0.11.1"; + version = "1.7.11"; in buildPythonPackage rec { pname = "litellm"; @@ -19,7 +26,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-5Zk1lc7G0dU/AoLE5V+p30wE/gRfYRPsVS3sNgwWzCU="; + hash = "sha256-B2LGaA6A+pU2aDzPS2d5stY+Z8Wxq3BkXB1CLY6vBiY="; }; postPatch = '' @@ -31,10 +38,16 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - importlib-metadata openai python-dotenv tiktoken + importlib-metadata + tokenizers + click + jinja2 + certifi + appdirs + aiohttp ]; # the import check phase fails trying to do a network request to openai diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix index 26570a1540b69..e70493e750c06 100644 --- a/pkgs/development/python-modules/luddite/default.nix +++ b/pkgs/development/python-modules/luddite/default.nix @@ -1,31 +1,31 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools +, packaging , pytestCheckHook -, pytest-socket , pytest-mock }: buildPythonPackage rec { pname = "luddite"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "jumptrading"; repo = pname; rev = "v${version}"; - sha256 = "8/7uwO5HLhyXYt+T6VUO/O7TN9+FfRlT8y0r5+CJ/l4="; + hash = "sha256-JXIM7/5LO95oabM16GwAt3v3a8uldGpGXDWmVic8Ins="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace "--cov=luddite --cov-report=html --cov-report=term --no-cov-on-fail" "" + --replace "--cov=luddite --cov-report=html --cov-report=term --no-cov-on-fail" "" \ + --replace "--disable-socket" "" ''; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ packaging ]; - nativeCheckInputs = [ pytestCheckHook pytest-socket pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; pythonImportsCheck = [ "luddite" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/luqum/default.nix b/pkgs/development/python-modules/luqum/default.nix index 2c9f78fc583cb..afad9262c7b3b 100644 --- a/pkgs/development/python-modules/luqum/default.nix +++ b/pkgs/development/python-modules/luqum/default.nix @@ -1,40 +1,61 @@ { lib , buildPythonPackage +, elastic-transport +, elasticsearch-dsl , fetchFromGitHub -, pythonOlder -# dependencies , ply -# test dependencies -, elasticsearch-dsl +, pytestCheckHook +, pythonOlder +, setuptools }: -let + +buildPythonPackage rec { pname = "luqum"; version = "0.13.0"; -in -buildPythonPackage { - inherit pname version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jurismarches"; - repo = pname; - rev = version; + repo = "luqum"; + rev = "refs/tags/${version}"; hash = "sha256-lcJCLl0crCl3Y5UlWBMZJR2UtVP96gaJNRxwY9Xn7TM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '--doctest-modules --doctest-glob="test_*.rst" --cov=luqum --cov-branch --cov-report html --no-cov-on-fail' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ply ]; nativeCheckInputs = [ + elastic-transport elasticsearch-dsl + pytestCheckHook + ]; + + pythonImportsCheck = [ + "luqum" + ]; + + disabledTestPaths = [ + # Tests require an Elasticsearch instance + "tests/test_elasticsearch/test_es_integration.py" + "tests/test_elasticsearch/test_es_naming.py" ]; meta = with lib; { - description = "A lucene query parser generating ElasticSearch queries and more !"; + description = "A lucene query parser generating ElasticSearch queries"; homepage = "https://github.com/jurismarches/luqum"; + changelog = "https://github.com/jurismarches/luqum/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 4701b456e09af..62b97f53b1e87 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -2,20 +2,25 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "mailchecker"; - version = "5.0.9"; - format = "setuptools"; + version = "6.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iwg5B9pC2qRI2T6xnwyXjd4uhWVhel52Jxs1pfcoXM0="; + hash = "sha256-PXo6dfiAqC1WD/z5NBI6UZVUl/cwlvoqKDyfZI4fn2s="; }; + nativeBuildInputs = [ + setuptools + ]; + # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix index 03d4c5c05d879..fc868ffefd2c4 100644 --- a/pkgs/development/python-modules/maison/default.nix +++ b/pkgs/development/python-modules/maison/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "maison"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dbatten5"; repo = "maison"; rev = "refs/tags/v${version}"; - hash = "sha256-uJW+7+cIt+jnbiC+HvT7KzyNk1enEtELTxtfc4eXAPU="; + hash = "sha256-XNo7QS8BCYzkDozLW0T+KMQPI667lDTCFtOqKq9q3hw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index c0040947488f7..abec37fc5ed1b 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -5,7 +5,7 @@ , python , isPy27 , six -, zope_testing +, zope-testing }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ six ]; - nativeCheckInputs = [ zope_testing ]; + nativeCheckInputs = [ zope-testing ]; meta = with lib; { description = "A documentation builder"; diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index f898acad51446..d61ddf90362df 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -1,31 +1,32 @@ { lib , buildPythonPackage +, ciso8601 , fetchFromGitHub -, pythonOlder -, setuptools -, typing-extensions -, orjson , msgpack -, pyyaml -, tomli-w -, tomli -, pytestCheckHook -, ciso8601 +, orjson , pendulum , pytest-mock +, pytestCheckHook +, pythonOlder +, pyyaml +, setuptools +, tomli +, tomli-w +, typing-extensions }: buildPythonPackage rec { pname = "mashumaro"; - version = "3.10"; - format = "pyproject"; - disabled = pythonOlder "3.7"; + version = "3.11"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Fatal1ty"; - repo = pname; + repo = "mashumaro"; rev = "refs/tags/v${version}"; - hash = "sha256-PvMEwIxurDGwYMCmNFThedxDY4vwATHYwMlXkucNuwM="; + hash = "sha256-7gRbTNNK8elWsL0ub7c/EeswIk4xxJOxKVk8HmvWMZA="; }; nativeBuildInputs = [ @@ -37,10 +38,20 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - orjson = [ orjson ]; - msgpack = [ msgpack ]; - yaml = [ pyyaml ]; - toml = [ tomli-w ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + orjson = [ + orjson + ]; + msgpack = [ + msgpack + ]; + yaml = [ + pyyaml + ]; + toml = [ + tomli-w + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; }; nativeCheckInputs = [ @@ -55,7 +66,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Fast and well tested serialization library on top of dataclasses"; + description = "Serialization library on top of dataclasses"; homepage = "https://github.com/Fatal1ty/mashumaro"; changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index 1e0dbb1668395..d99b5c3e2e0c8 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -33,13 +33,13 @@ assert !lapack.isILP64; buildPythonPackage rec { pname = "meep"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "NanoComp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9ha6YPlvq2HUTuEqngFOAJUqCahBi7L7O8qsIMMfbrY="; + hash = "sha256-o/Xrd/Gn1RsbB+ZfggGH6/ugdsGtfTe2RgaHdpY5AyE="; }; format = "other"; diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 7f2fe358c2fe3..33f52d0cea672 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.11.6"; + version = "0.11.7"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = "refs/tags/${version}"; - hash = "sha256-qd9JuZv1utwL523eiQ79P3hXuVQ8+teTatOJCtI6v00="; + hash = "sha256-jqtyJHoG/8tgv4OJleb7DV6C7pCpgplieLykfvO3cNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mirakuru/default.nix b/pkgs/development/python-modules/mirakuru/default.nix index 4376c9387fcf4..97f1cef438ae6 100644 --- a/pkgs/development/python-modules/mirakuru/default.nix +++ b/pkgs/development/python-modules/mirakuru/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mirakuru"; - version = "2.5.1"; + version = "2.5.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ClearcodeHQ"; repo = "mirakuru"; rev = "refs/tags/v${version}"; - hash = "sha256-jBsSvIy2FaAYlDZLjJXl9hyCiK+nk/cM5j128f24dRc="; + hash = "sha256-I1TKP0ESuBMTcReZf0tryjvGpSpwzofwmOiQqhyr6Zg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 0bd3f97175ce8..85687b1882bab 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.6"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Blueswen"; repo = "mkdocs-swagger-ui-tag"; rev = "refs/tags/v${version}"; - hash = "sha256-NEFogrLJjOh98rChlJuxAeTj31yyL4OoE/jBUcHbBZM="; + hash = "sha256-lvE/mN56X2fx835GFNDYQc7ptxBYqwjrJ9Z6Flcvufg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index d8fb50f586b28..219f0e63c7b1f 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -1,35 +1,36 @@ { lib , buildPythonPackage , fetchFromGitHub +, importlib-metadata , jinja2 , markdown , markupsafe , mkdocs , mkdocs-autorefs +, pdm-backend , pymdown-extensions , pytestCheckHook -, pdm-backend , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.23.0"; - format = "pyproject"; + version = "0.24.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mkdocstrings"; - repo = pname; + repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-t7wxm600XgYl1jsqjOpZdWcmqR9qafdKTaz/xDPdDPY="; + hash = "sha256-UqX2jNNYwDNhb71qGdjHNoo2MmSxjf/bZiUoSxlE2XQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'dynamic = ["version"]' 'version = "${version}"' \ - --replace 'license = "ISC"' 'license = {text = "ISC"}' + --replace 'dynamic = ["version"]' 'version = "${version}"' ''; nativeBuildInputs = [ @@ -43,6 +44,9 @@ buildPythonPackage rec { mkdocs mkdocs-autorefs pymdown-extensions + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix new file mode 100644 index 0000000000000..2392de3847bd9 --- /dev/null +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -0,0 +1,70 @@ +{ buildPythonPackage +, cmake +, fetchPypi +, glfw +, lib +, mujoco +, numpy +, perl +, pkgs +, pybind11 +, python +, setuptools +}: + +buildPythonPackage rec { + pname = "mujoco"; + version = "3.0.1"; + + pyproject = true; + + # We do not fetch from the repository because the PyPi tarball is + # impurely build via + # <https://github.com/google-deepmind/mujoco/blob/main/python/make_sdist.sh> + # in the project's CI. + src = fetchPypi { + inherit pname version; + hash = "sha256-pftecOk4q19qKBHs9hBBVenI+SgJg9VT7vc6NKuiY0s="; + }; + + nativeBuildInputs = [ cmake setuptools ]; + dontUseCmakeConfigure = true; + buildInputs = [ mujoco pybind11 ]; + propagatedBuildInputs = [ glfw numpy ]; + + pythonImportsCheck = [ "${pname}" ]; + + env.MUJOCO_PATH = "${mujoco}"; + env.MUJOCO_PLUGIN_PATH = "${mujoco}/lib"; + env.MUJOCO_CMAKE_ARGS = "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON"; + + preConfigure = + # Use system packages for pybind + '' + ${perl}/bin/perl -0777 -i -pe "s/(findorfetch\(.{3}USE_SYSTEM_PACKAGE.{3})(OFF)(.{3}PACKAGE_NAME.{3}pybind11.*\))/\1ON\3/gms" mujoco/CMakeLists.txt + '' + + # Use non-system eigen3, lodepng, abseil: Remove mirror info and prefill + # dependency directory. $build from setuptools. + (let + # E.g. 3.11.2 -> "311" + pythonVersionMajorMinor = with lib.versions; + "${major python.pythonVersion}${minor python.pythonVersion}"; + in '' + ${perl}/bin/perl -0777 -i -pe "s/GIT_REPO\n.*\n.*GIT_TAG\n.*\n//gm" mujoco/CMakeLists.txt + ${perl}/bin/perl -0777 -i -pe "s/(FetchContent_Declare\(\n.*lodepng\n.*)(GIT_REPO.*\n.*GIT_TAG.*\n)(.*\))/\1\3/gm" mujoco/simulate/CMakeLists.txt + + build="/build/${pname}-${version}/build/temp.linux-x86_64-cpython-${pythonVersionMajorMinor}/" + mkdir -p $build/_deps + ln -s ${mujoco.pin.lodepng} $build/_deps/lodepng-src + ln -s ${mujoco.pin.eigen3} $build/_deps/eigen-src + ln -s ${mujoco.pin.abseil-cpp} $build/_deps/abseil-cpp-src + ''); + + meta = with lib; { + description = + "Python bindings for MuJoCo: a general purpose physics simulator."; + homepage = "https://mujoco.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ tmplt ]; + }; +} diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix index 87dad04cf7813..6402005bed6ef 100644 --- a/pkgs/development/python-modules/napalm/hp-procurve.nix +++ b/pkgs/development/python-modules/napalm/hp-procurve.nix @@ -5,6 +5,7 @@ , netmiko , pip , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -12,32 +13,37 @@ buildPythonPackage rec { version = "0.7.0"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "napalm-automation-community"; - repo = pname; - rev = version; + repo = "napalm-hp-procurve"; + rev = "refs/tags/${version}"; hash = "sha256-cO4kxI90krj1knzixRKWxa77OAaxjO8dLTy02VpkV9M="; }; - nativeBuildInputs = [ - pip - ]; - - # dependency installation in setup.py doesn't work patchPhase = '' + # Dependency installation in setup.py doesn't work echo -n > requirements.txt + substituteInPlace setup.cfg \ + --replace "--cov=napalm_procurve --cov-report term-missing -vs --pylama" "" ''; - buildInputs = [ napalm ]; + nativeBuildInputs = [ + pip + ]; - propagatedBuildInputs = [ netmiko ]; + buildInputs = [ + napalm + ]; - # setup.cfg seems to contain invalid pytest parameters - preCheck = '' - rm setup.cfg - ''; + propagatedBuildInputs = [ + netmiko + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTests = [ # AssertionError: Some methods vary. @@ -46,6 +52,11 @@ buildPythonPackage rec { "test_get_config_filtered" # AssertionError "test_get_interfaces" + "test_get_facts" + ]; + + pythonImportsCheck = [ + "napalm_procurve" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/netapp-ontap/default.nix b/pkgs/development/python-modules/netapp-ontap/default.nix index 28a953f29f131..7516c5da20e33 100644 --- a/pkgs/development/python-modules/netapp-ontap/default.nix +++ b/pkgs/development/python-modules/netapp-ontap/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "netapp-ontap"; - version = "9.13.1.0"; + version = "9.14.1.0"; format = "setuptools"; src = fetchPypi { pname = "netapp_ontap"; inherit version; - sha256 = "sha256-jPKfPJXtzARRlSuwkfJeZueQouwaaa0D6rZ+BcpILq0="; + sha256 = "sha256-nh7SHcyujTVXSgxQajRA4EueN6Hf8cKueQbsbnr6+qw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix new file mode 100644 index 0000000000000..902fa62e33873 --- /dev/null +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonRelaxDepsHook +, flit-core +, certifi +, cryptography +, python-dateutil +, typing-extensions +, urllib3 +}: + +let + pname = "nethsm"; + version = "1.0.0"; +in + +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sENuSdA4pYt8v2w2RvDkcQLYCP9V0vZOdWOlkNBi3/o="; + }; + + propagatedBuildInputs = [ + certifi + cryptography + python-dateutil + typing-extensions + urllib3 + ]; + + nativeBuildInputs = [ + flit-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = true; + + pythonImportsCheck = [ "nethsm" ]; + + meta = with lib; { + description = "Client-side Python SDK for NetHSM"; + homepage = "https://github.com/Nitrokey/nethsm-sdk-py"; + changelog = "https://github.com/Nitrokey/nethsm-sdk-py/releases/tag/v${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ frogamic ]; + }; +} diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 517c90b3f4494..1824852538759 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "netutils"; version = "1.6.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "networktocode"; - repo = pname; + repo = "netutils"; rev = "refs/tags/v${version}"; hash = "sha256-ocajE7E4xIatEmv58/9gEpWF2plJdiZXjk6ajD2vTzw="; }; @@ -32,7 +32,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema - napalm ]; passthru.optional-dependencies.optionals = [ diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index fd2ad5c5e8c17..155d1c60b1757 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "3.0.1"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - hash = "sha256-3U2ho3nSYy8WhRi+jc2c3dftxsMjgJT9jSFHazWGoLw="; + hash = "sha256-947qYsgJOL9T6pFPpbbJL0SPDqtWCeDlpzfd4DlAQzQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index ae8d6737380e0..9bc3ced1208bf 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.2.0"; + version = "16.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-z5CFFfVJYeXaDFVPYaBOfUMzgl+Uvn3LYS5Zn1AHRy0="; + hash = "sha256-qJrreq2GhJxrX9keZOYVzjihs0RCymad+MGErW5ecPc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 37d6dd8b54e8d..d36bc9004e33b 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "2.11.6"; + version = "2.12.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-CTZxxKZPrAvuWGhwD7qAPG10rry0H71QSRXbGT0J3J0="; + hash = "sha256-0Ic7WKQbwA7TnFvXRZz+mFehjWP6n+Pyp0IySMy8sdw="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 89a02ae69f154..3c13e035bf025 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -1,30 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, aiohttp -, matplotlib +, pythonOlder +, hatchling +# propagated +, httpx +, pydantic +, typing-extensions +, anyio +, distro +, sniffio +, tqdm +# optional , numpy -, openpyxl , pandas , pandas-stubs -, plotly +# tests +, pytestCheckHook , pytest-asyncio , pytest-mock -, pytestCheckHook -, pythonOlder -, requests -, scikit-learn -, tenacity -, tqdm -, typing-extensions -, wandb -, withOptionalDependencies ? false +, respx +, dirty-equals }: buildPythonPackage rec { pname = "openai"; - version = "0.28.1"; - format = "setuptools"; + version = "1.3.7"; + pyproject = true; disabled = pythonOlder "3.7.1"; @@ -32,35 +34,30 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-liJyeGxnYIC/jUQKdeATHpVJb/12KGbeM94Y2YQphfY="; + hash = "sha256-Pa53s3U5vby1Fq14WMCJnSR6KA3xkVHmBexkNoX/0sk="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ - aiohttp - requests + httpx + pydantic + anyio + distro + sniffio tqdm ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ] ++ lib.optionals withOptionalDependencies (builtins.attrValues { - inherit (passthru.optional-dependencies) embeddings wandb; - }); + ]; passthru.optional-dependencies = { datalib = [ numpy - openpyxl pandas pandas-stubs ]; - embeddings = [ - matplotlib - plotly - scikit-learn - tenacity - ] ++ passthru.optional-dependencies.datalib; - wandb = [ - wandb - ] ++ passthru.optional-dependencies.datalib; }; pythonImportsCheck = [ @@ -71,21 +68,16 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-mock - ]; - - pytestFlagsArray = [ - "openai/tests" + respx + dirty-equals ]; OPENAI_API_KEY = "sk-foo"; disabledTestPaths = [ - # Requires a real API key - "openai/tests/test_endpoints.py" - "openai/tests/asyncio/test_endpoints.py" - # openai: command not found - "openai/tests/test_file_cli.py" - "openai/tests/test_long_examples_validator.py" + # makes network requests + "tests/test_client.py" + "tests/api_resources" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix index 9fc3c7fe8143f..ba3e0b8460b19 100644 --- a/pkgs/development/python-modules/opentsne/default.nix +++ b/pkgs/development/python-modules/opentsne/default.nix @@ -7,7 +7,7 @@ , scipy , scikit-learn , pytestCheckHook -, nix-update-script +, pythonOlder , setuptools , wheel }: @@ -15,14 +15,16 @@ let self = buildPythonPackage rec { pname = "opentsne"; - version = "1.0.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pavlin-policar"; repo = "openTSNE"; - rev = "v${version}"; - hash = "sha256-L5Qx6dMJlXF3EaWwlFTQ3dkhGXc5PvQBXYJo+QO+Hxc="; + rev = "refs/tags/v${version}"; + hash = "sha256-UTfEjjNz1mm5fhyTw9GRlMNURwWlr6kLMjrMngkFV3Y="; }; nativeBuildInputs = [ @@ -32,13 +34,19 @@ let wheel ]; - propagatedBuildInputs = [ numpy scipy scikit-learn ]; + propagatedBuildInputs = [ + numpy + scipy + scikit-learn + ]; + + pythonImportsCheck = [ + "openTSNE" + ]; - pythonImportsCheck = [ "openTSNE" ]; doCheck = false; passthru = { - updateScript = nix-update-script {}; tests.pytest = self.overridePythonAttrs (old: { pname = "${old.pname}-tests"; format = "other"; @@ -53,12 +61,12 @@ let }); }; - meta = { + meta = with lib; { description = "Modular Python implementation of t-Distributed Stochasitc Neighbor Embedding"; homepage = "https://github.com/pavlin-policar/openTSNE"; - changelog = "https://github.com/pavlin-policar/openTSNE/releases/tag/${version}"; - license = [ lib.licenses.bsd3 ]; - maintainers = [ lib.maintainers.lucasew ]; + changelog = "https://github.com/pavlin-policar/openTSNE/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ lucasew ]; }; }; in self diff --git a/pkgs/development/python-modules/opentypespec/default.nix b/pkgs/development/python-modules/opentypespec/default.nix new file mode 100644 index 0000000000000..c4bf0cde2c972 --- /dev/null +++ b/pkgs/development/python-modules/opentypespec/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "opentypespec"; + version = "1.9.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-fOEHmtlCkFhn1jyIA+CsHIfud7x3PPb7UWQsnrVyDqY="; + }; + + doCheck = true; + nativeCheckInputs = [ + unittestCheckHook + ]; + unittestFlagsArray = [ "-s" "test" "-v" ]; + + meta = with lib; { + description = "Python library for OpenType specification metadata"; + homepage = "https://github.com/simoncozens/opentypespec-py"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix new file mode 100644 index 0000000000000..70ae6eb5e08b4 --- /dev/null +++ b/pkgs/development/python-modules/openusd/default.nix @@ -0,0 +1,131 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, writeShellScriptBin +, cmake +, doxygen +, draco +, graphviz-nox +, ninja +, setuptools +, pyqt6 +, pyopengl +, jinja2 +, pyside6 +, boost +, numpy +, git +, tbb +, opensubdiv +, openimageio +, opencolorio +, osl +, ptex +, embree +, alembic +, openexr +, flex +, bison +, qt6 +, python +}: +let + # Matches the pyside6-uic implementation + # https://code.qt.io/cgit/pyside/pyside-setup.git/tree/sources/pyside-tools/pyside_tool.py?id=e501cad66146a49c7a259579c7bb94bc93a67a08#n82 + pyside-tools-uic = writeShellScriptBin "pyside6-uic" '' + exec ${qt6.qtbase}/libexec/uic -g python "$@" + ''; +in +buildPythonPackage rec { + pname = "OpenUSD"; + version = "23.11"; + src = fetchFromGitHub { + owner = "PixarAnimationStudios"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-5zQrfB14kXs75WbL3s4eyhxELglhLNxU2L2aVXiyVjg="; + }; + + outputs = ["out" "doc"]; + + format = "other"; + + propagatedBuildInputs = [ + setuptools + pyqt6 + pyopengl + jinja2 + pyside6 + pyside-tools-uic + boost + numpy + ]; + + cmakeFlags = [ + "-DPXR_BUILD_EXAMPLES=OFF" + "-DPXR_BUILD_TUTORIALS=OFF" + "-DPXR_BUILD_USD_TOOLS=ON" + "-DPXR_BUILD_IMAGING=ON" + "-DPXR_BUILD_USD_IMAGING=ON" + "-DPXR_BUILD_USDVIEW=ON" + "-DPXR_BUILD_DOCUMENTATION=ON" + "-DPXR_BUILD_PYTHON_DOCUMENTATION=ON" + "-DPXR_BUILD_EMBREE_PLUGIN=ON" + "-DPXR_BUILD_ALEMBIC_PLUGIN=ON" + "-DPXR_ENABLE_OSL_SUPPORT=ON" + "-DPXR_BUILD_DRACO_PLUGIN=ON" + "-DPXR_BUILD_MONOLITHIC=ON" # Seems to be commonly linked to monolithically + ]; + + nativeBuildInputs = [ + cmake + ninja + git + qt6.wrapQtAppsHook + doxygen + graphviz-nox + ]; + buildInputs = [ + tbb + opensubdiv + openimageio + opencolorio + osl + ptex + embree + alembic.dev + openexr + flex + bison + boost + draco + qt6.qtbase + qt6.qtwayland + ]; + + pythonImportsCheck = [ "pxr" "pxr.Usd" ]; + + postInstall = '' + # Make python lib properly accessible + target_dir=$out/${python.sitePackages} + mkdir -p $(dirname $target_dir) + mv $out/lib/python $target_dir + + mv $out/docs $doc + + rm $out/share -r # only examples + rm $out/tests -r + ''; + + meta = { + description = "Universal Scene Description"; + longDescription = '' + Universal Scene Description (USD) is an efficient, scalable system + for authoring, reading, and streaming time-sampled scene description + for interchange between graphics applications. + ''; + homepage = "https://openusd.org/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ shaddydc ]; + }; +} diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 72e83c216699c..df8bc234e2afc 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.39"; + version = "0.0.40"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-5JcediHl2TeMhYa6OJqoW5K0SlAjdIrMwj2IHh3qW7I="; + hash = "sha256-0vk8LGqU3rOgjC8zXkijmIZG8inxwTw2IDneFfy5eQw="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/ots-python/0001-use-packaged-ots.patch b/pkgs/development/python-modules/ots-python/0001-use-packaged-ots.patch new file mode 100644 index 0000000000000..233e97d7b4b83 --- /dev/null +++ b/pkgs/development/python-modules/ots-python/0001-use-packaged-ots.patch @@ -0,0 +1,34 @@ +From 6ba3b97253cf540fdf4b36672f290def72386096 Mon Sep 17 00:00:00 2001 +From: Dan Callaghan <djc@djc.id.au> +Date: Sun, 23 Apr 2023 21:26:53 +1000 +Subject: [PATCH] use packaged ots + + +diff --git a/setup.py b/setup.py +index 6c3ccae..ca021da 100755 +--- a/setup.py ++++ b/setup.py +@@ -248,7 +248,6 @@ def run(self): + platforms=["posix", "nt"], + package_dir={"": "src/python"}, + packages=find_packages("src/python"), +- ext_modules=[ots_sanitize], + zip_safe=False, + cmdclass=cmdclass, + setup_requires=["setuptools_scm"], +diff --git a/src/python/ots/__init__.py b/src/python/ots/__init__.py +index 5fc1724..db9d21e 100644 +--- a/src/python/ots/__init__.py ++++ b/src/python/ots/__init__.py +@@ -3,7 +3,7 @@ + import sys + import os + +-OTS_SANITIZE = os.path.join(os.path.dirname(__file__), "ots-sanitize") ++OTS_SANITIZE = "@ots_sanitize@" + + __all__ = ["sanitize", "OTSError", "CalledProcessError"] + +-- +2.38.4 + diff --git a/pkgs/development/python-modules/ots-python/default.nix b/pkgs/development/python-modules/ots-python/default.nix new file mode 100644 index 0000000000000..32863e2e4bd31 --- /dev/null +++ b/pkgs/development/python-modules/ots-python/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, substituteAll +, opentype-sanitizer +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ots-python"; + version = "9.1.0"; + + src = fetchPypi { + pname = "opentype-sanitizer"; + inherit version; + hash = "sha256-1Zdd+eRECimZl8L8CCkm7pCjN0TafSsc5i2Y6/oH88I="; + }; + + patches = [ + # Invoke ots-sanitize from the opentype-sanitizer package instead of + # downloading precompiled binaries from the internet. + # (nixpkgs-specific, not upstreamable) + (substituteAll { + src = ./0001-use-packaged-ots.patch; + ots_sanitize = "${opentype-sanitizer}/bin/ots-sanitize"; + }) + ]; + + propagatedBuildInputs = [ + opentype-sanitizer + ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python wrapper for ots (OpenType Sanitizer)"; + homepage = "https://github.com/googlefonts/ots-python"; + license = licenses.bsd3; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index d9c344e6e72c1..6fd4cd98debc5 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.5.20"; + version = "19.5.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-atrrPU9aQvpbI3JYdsnGkdRpq3SRuBJpezF1qc1USB0="; + hash = "sha256-MR+dPGap7IgdWV+bKLUU3E3lzoG+RaaspjqedMQMk5Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 3b68065a23b2a..d6697b634504a 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.18.0"; + version = "0.19.0"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-tEgYrQaVcWZadmhV6JRuXnk8m9oJLNSfb0hA309bX1U="; + hash = "sha256-pGMOc/GSh3q2HW1mfW+XFgpOyiXd3cdh56cvXatseuc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/picobox/default.nix b/pkgs/development/python-modules/picobox/default.nix index 176c86e84f079..a70fc8eecbe19 100644 --- a/pkgs/development/python-modules/picobox/default.nix +++ b/pkgs/development/python-modules/picobox/default.nix @@ -1,27 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , flask , hatchling , hatch-vcs -, isPy27 , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "picobox"; - version = "3.0.0"; + version = "4.0.0"; - format = "pyproject"; + pyproject = true; - disabled = isPy27; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ikalnytskyi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LQiSurL+eFRJ9iQheoo66o44BlfBtAatk8deuMFROcc="; + hash = "sha256-JtrwUVo3b4G34OUShX4eJS2IVubl4vBmEtB/Jhk4eJI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 004930491a39b..555f7aa301970 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , auditwheel , buildPythonPackage , git @@ -53,8 +54,10 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.0.4", "wheel==0.41.2", "auditwheel==5.4.0"]' \ - 'requires = ["setuptools", "setuptools-scm", "wheel", "auditwheel"]' \ + 'requires = ["setuptools", "setuptools-scm", "wheel"]' \ --replace 'version_file = "playwright/_repo_version.py"' "" + # FIXME version_file is available in setuptools-scm>=8.0.0 + echo "__version__ = version = '${version}'" > playwright/_repo_version.py # Skip trying to download and extract the driver. # This is done manually in postInstall instead. @@ -67,7 +70,8 @@ buildPythonPackage rec { ''; - nativeBuildInputs = [ git setuptools-scm setuptools auditwheel ]; + nativeBuildInputs = [ git setuptools-scm setuptools ] + ++ lib.optionals stdenv.isLinux [ auditwheel ]; propagatedBuildInputs = [ greenlet diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 13114dd78456d..fdb75e22115da 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , six -, zope_testing +, zope-testing , setuptools }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "39bc23bbb59b765702090ad61fe579f8bd9fe1f005f4dd1c2988a5bd1a71faf0"; }; - propagatedBuildInputs = [ six setuptools zope_testing ]; + propagatedBuildInputs = [ six setuptools zope-testing ]; # Huge amount of testing dependencies (including Zope2) doCheck = false; diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index b3ba05351ea2e..9624f322a74eb 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "podman"; - version = "4.8.0"; + version = "4.8.0.post1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "containers"; repo = "podman-py"; rev = "refs/tags/v${version}"; - hash = "sha256-lw8ZW1Uh6pbL5Z15NBBgKFm1143rEyFdecBHsSwBYVo="; + hash = "sha256-d7rNXqYeeDHilzNc1jcIWq7rNcYZCvlf9ipu1m3oFfw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index 082fe4ec1965b..e324813c6a587 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.1.20230817"; + version = "1.5.1.20231109"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eSCJYZWvFjIwY18aXO4JWPVgA++MQh+AXsgfE0+ApXw="; + hash = "sha256-dOVtQQVgkVwsUTLjYbATDkv/4xKi9FIw6sUNfAlLxAo="; }; # Tests are not shipped and there are no GitHub tags diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 0f20800ece0d4..a8af71d51a64a 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.0.2"; + version = "3.1.0"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-QASqjphAWtYuIyhbFTYwv1gD+rXvrmp5W0Te4MFn1AA="; + hash = "sha256-+FxRC1NxDaZHjMQFTyRymvHp6A3VE76kANgpVtq2WEs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index b6f1ed0055400..94a940f8a9fec 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { cp ../../README.md . substituteInPlace setup.py \ --replace "3.0.0" "${version}" \ - --replace "grpcio~=1.59" "grpcio" \ + --replace "grpcio==1.56.2" "grpcio" \ --replace "semver~=2.13" "semver" ''; diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index 028d61f745a28..8b736011fa756 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "0.15.0"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-U01XRT6XS0Uxpk+2pYOGAkZiZ5kogMBtcuEU1OJpSMo="; + hash = "sha256-javjmdFQBxg/yqa6lsxKK18DgvVu/YmqvaWo2Upgzqs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 34ed59e96061b..74e5b243e60b9 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pygls"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "openlawlibrary"; repo = "pygls"; rev = "refs/tags/v${version}"; - hash = "sha256-hIr06qzOkObEcrIgFUloAPBJdOtcipl4htpbbUVkbdw="; + hash = "sha256-ARez9fs50kScfMp/W/aFIOcJonpFrcfyrzJuVwou7fk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysignalclirestapi/default.nix b/pkgs/development/python-modules/pysignalclirestapi/default.nix index 0e033ad99ff8f..b3dd6f696006c 100644 --- a/pkgs/development/python-modules/pysignalclirestapi/default.nix +++ b/pkgs/development/python-modules/pysignalclirestapi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pysignalclirestapi"; - version = "0.3.21"; + version = "0.3.22"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "bbernhard"; repo = "pysignalclirestapi"; rev = version; - hash = "sha256-CAZ6UgGz7ZDXlQlngi+hEhczOphvAT/Yl9vLqnrS1Qc="; + hash = "sha256-m8Sihf5vTDntd5Tbaa5o55G/k/rqtmjWreoTab58CHU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyspx/default.nix b/pkgs/development/python-modules/pyspx/default.nix new file mode 100644 index 0000000000000..b8e3cb49df6fb --- /dev/null +++ b/pkgs/development/python-modules/pyspx/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, cffi +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "pyspx"; + version = "0.5.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "sphincs"; + repo = "pyspx"; + rev = "refs/tags/v${version}"; + hash = "sha256-hMZ7JZoo5RdUwQYpGjtZznH/O6rBUXv+svfOAI0cjqs="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cffi + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyspx" + ]; + + meta = with lib; { + description = "Python bindings for SPHINCS"; + homepage = "https://github.com/sphincs/pyspx"; + changelog = "https://github.com/sphincs/pyspx/releases/tag/v${version}"; + license = licenses.cc0; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix index d5761bebee7f5..568152605c77d 100644 --- a/pkgs/development/python-modules/pysyncthru/default.nix +++ b/pkgs/development/python-modules/pysyncthru/default.nix @@ -1,33 +1,40 @@ { lib -, isPy27 , buildPythonPackage +, pythonOlder , fetchFromGitHub +, setuptools , aiohttp , demjson3 -, python +, unittestCheckHook }: buildPythonPackage rec { pname = "pysyncthru"; - version = "0.7.10"; + version = "0.8.0"; - disabled = isPy27; + disabled = pythonOlder "3.7"; + + pyproject = true; src = fetchFromGitHub { owner = "nielstron"; repo = "pysyncthru"; - rev = "release-${version}"; - sha256 = "1c29w2ldrnq0vxr9cfa2pjhwdvrpw393c84khgg2y56jrkbidq53"; + rev = "refs/tags/${version}"; + hash = "sha256-Zije1WzfgIU9pT0H7T/Mx+5gEBCsRgMLkfsa/KB0YtI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp demjson3 ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; + nativeCheckInputs = [ + unittestCheckHook + ]; pythonImportsCheck = [ "pysyncthru" ]; diff --git a/pkgs/development/python-modules/python-csxcad/default.nix b/pkgs/development/python-modules/python-csxcad/default.nix index 1044fe0a2748f..57e58dd3c19f7 100644 --- a/pkgs/development/python-modules/python-csxcad/default.nix +++ b/pkgs/development/python-modules/python-csxcad/default.nix @@ -10,14 +10,9 @@ buildPythonPackage rec { pname = "python-csxcad"; - version = "unstable-2020-02-18"; + version = csxcad.version; - src = fetchFromGitHub { - owner = "thliebig"; - repo = "CSXCAD"; - rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518"; - sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; - }; + src = csxcad.src; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/python-mbedtls/default.nix b/pkgs/development/python-modules/python-mbedtls/default.nix new file mode 100644 index 0000000000000..967bade85b3b2 --- /dev/null +++ b/pkgs/development/python-modules/python-mbedtls/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, certifi +, cython +, mbedtls_2 +, pytestCheckHook +, setuptools +, typing-extensions +}: + +buildPythonPackage rec { + pname = "python-mbedtls"; + version = "2.8.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Synss"; + repo = "python-mbedtls"; + rev = version; + hash = "sha256-gMFludfAprQ/1JR77Ee6/xVvGLJ9pY1LrouLpSKVrzk="; + }; + + nativeBuildInputs = [ + cython + setuptools + ]; + + buildInputs = [ + mbedtls_2 + ]; + + propagatedBuildInputs = [ + certifi + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "mbedtls" ]; + + meta = with lib; { + description = "Cryptographic library with an mbed TLS back end"; + homepage = "https://github.com/Synss/python-mbedtls"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/python-openems/default.nix b/pkgs/development/python-modules/python-openems/default.nix index 7a186276dfc79..c1480c9f2d3ad 100644 --- a/pkgs/development/python-modules/python-openems/default.nix +++ b/pkgs/development/python-modules/python-openems/default.nix @@ -12,14 +12,9 @@ buildPythonPackage rec { pname = "python-openems"; - version = "unstable-2020-02-15"; + version = openems.version; - src = fetchFromGitHub { - owner = "thliebig"; - repo = "openEMS"; - rev = "ba793ac84e2f78f254d6d690bb5a4c626326bbfd"; - sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; - }; + src = openems.src; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/pytikz-allefeld/default.nix b/pkgs/development/python-modules/pytikz-allefeld/default.nix new file mode 100644 index 0000000000000..4701431e715d2 --- /dev/null +++ b/pkgs/development/python-modules/pytikz-allefeld/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pymupdf +, numpy +, ipython +, texlive +}: + +buildPythonPackage rec { + pname = "pytikz-allefeld"; # "pytikz" on pypi is a different module + version = "unstable-2022-11-01"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "allefeld"; + repo = "pytikz"; + rev = "f878ebd6ce5a647b1076228b48181b147a61abc1"; + hash = "sha256-G59UUkpjttJKNBN0MB/A9CftO8tO3nv8qlTxt3/fKHk="; + }; + + propagatedBuildInputs = [ + pymupdf + numpy + ipython + ]; + + pythonImportsCheck = [ "tikz" ]; + + nativeCheckInputs = [ texlive.combined.scheme-small ]; + checkPhase = '' + runHook preCheck + python -c 'if 1: + from tikz import * + pic = Picture() + pic.draw(line([(0, 0), (1, 1)])) + print(pic.code()) + pic.write_image("test.pdf") + ' + test -s test.pdf + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://github.com/allefeld/pytikz"; + description = "A Python interface to TikZ"; + license = licenses.gpl3; + maintainers = with maintainers; [ pbsds ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/pyunpack/default.nix b/pkgs/development/python-modules/pyunpack/default.nix index b6dff5a97d03c..ea7ad7d416a3a 100644 --- a/pkgs/development/python-modules/pyunpack/default.nix +++ b/pkgs/development/python-modules/pyunpack/default.nix @@ -1,16 +1,18 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , easyprocess , entrypoint2 , patool +, cabextract }: buildPythonPackage rec { pname = "pyunpack"; version = "0.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ponty"; @@ -23,15 +25,20 @@ buildPythonPackage rec { substituteInPlace pyunpack/__init__.py \ --replace \ '_exepath("patool")' \ - '"${patool}/bin/.patool-wrapped"' + '"${lib.getBin patool}/bin/.patool-wrapped"' ''; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ easyprocess entrypoint2 ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + cabextract + ]; pytestFlagsArray = [ "-x" ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 20984a99361fe..ef4e572c873af 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.78"; + version = "9.2.79"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-GBaaWIhAEvBMNoOIM+ruQoBZklEPos7AY4qJuwJ/KXA="; + hash = "sha256-wtRguqbSvypScYhPlnWXM1qcppaw2Tb93GNYc/fziCM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index 30e7afd82b4c4..f83a741dfd900 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "qdarkstyle"; - version = "3.1"; + version = "3.2.3"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - hash = "sha256-YAWE1iU0Pg3dEo3gg5PTw1Y3eGpJgn8XTSmqfKqCecE="; + hash = "sha256-DAt/dKbpISEAiZKzabq2BGgVfbHALNMNZKXpo7QC8a4="; }; # No tests available diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 43da9125f1ae7..797bda0d3ea40 100644 --- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -2,30 +2,37 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytest-mockito , pytestCheckHook , robotframework +, typing-extensions }: buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.2.0"; + version = "4.3.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "robotframework"; repo = "PythonLibCore"; rev = "refs/tags/v${version}"; - hash = "sha256-RJTn1zSVJYgbh93Idr77uHl02u0wpj6p6llSJfQVTQk="; + hash = "sha256-5ayOQyOhCg4nLpAyH/eQ6NYEApix0wsL2nhJzEXKJRo="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytest-mockito pytestCheckHook robotframework + typing-extensions ]; preCheck = '' diff --git a/pkgs/development/python-modules/rstr/default.nix b/pkgs/development/python-modules/rstr/default.nix new file mode 100644 index 0000000000000..3c80a274ceaf6 --- /dev/null +++ b/pkgs/development/python-modules/rstr/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "rstr"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-xKVk1N+0Ry2THRRcQ9HPGteMJFkhQud1W4hmF57qwBI="; + }; + + pyproject = true; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + doCheck = true; + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + description = "Python library to generate random strings"; + homepage = "https://github.com/leapfrogonline/rstr"; + license = licenses.bsd3; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 2affddbb6a4c0..13bee07a1859f 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -16,7 +16,6 @@ , extractcode-libarchive , fasteners , fetchPypi -, fetchpatch , fingerprints , ftfy , gemfileparser2 @@ -48,12 +47,12 @@ , pythonOlder , requests , saneyaml +, setuptools , spdx-tools , text-unidecode , toml , typecode , typecode-libmagic -, typing , urlpy , xmltodict , zipp @@ -61,17 +60,22 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.0.6"; + version = "32.0.8"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-suqk7LOnZgSJGlaHq81LDOSCHZWdsJOUbma6MEpHxSM="; + hash = "sha256-W6Ev1MV8cZU4bauAfmuZsBzMJKz7xpw8siO3Afn5mc8="; }; dontConfigure = true; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs beautifulsoup4 @@ -126,33 +130,12 @@ buildPythonPackage rec { xmltodict ] ++ lib.optionals (pythonOlder "3.9") [ zipp - ] ++ lib.optionals (pythonOlder "3.7") [ - typing ]; nativeCheckInputs = [ pytestCheckHook ]; - patches = [ - (fetchpatch { - name = "${pname}-allow-stable-spdx-tools.patch"; - url = "https://github.com/nexB/scancode-toolkit/commit/d89ab6584d3df6b7eb1d1394559e9d967d6db6ae.patch"; - includes = [ "src/*" ]; - hash = "sha256-AU3vJlOxmCy3yvkupVaAVxAKxJI3ymXEk+A5DWSkfOM="; - }) - ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pdfminer.six >= 20200101" "pdfminer.six" \ - --replace "pluggy >= 0.12.0, < 1.0" "pluggy" \ - --replace "pygmars >= 0.7.0" "pygmars" \ - --replace "license_expression >= 21.6.14" "license_expression" \ - --replace "intbitset >= 2.3.0, < 3.0" "intbitset" \ - --replace "spdx_tools == 0.7.0a3" "spdx_tools" - ''; - # Importing scancode needs a writeable home, and preCheck happens in between # pythonImportsCheckPhase and pytestCheckPhase. postInstall = '' @@ -163,7 +146,13 @@ buildPythonPackage rec { "scancode" ]; - # takes a long time and doesn't appear to do anything + disabledTestPaths = [ + # Tests are outdated + "src/formattedcode/output_spdx.py" + "src/scancode/cli.py" + ]; + + # Takes a long time and doesn't appear to do anything dontStrip = true; meta = with lib; { diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix new file mode 100644 index 0000000000000..4a0ce694866b4 --- /dev/null +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -0,0 +1,96 @@ +{ lib +, asn1crypto +, azure-identity +, azure-keyvault-keys +, boto3 +, botocore +, buildPythonPackage +, cryptography +, ed25519 +, fetchFromGitHub +, google-cloud-kms +, hatchling +, pynacl +, pyspx +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "securesystemslib"; + version = "0.30.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "secure-systems-lab"; + repo = "securesystemslib"; + rev = "refs/tags/v${version}"; + hash = "sha256-Jqw65VTMLA/X7VQGxN0BlTzF/lxBYirDKBf+xI9cfhg="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + passthru.optional-dependencies = { + PySPX = [ + pyspx + ]; + awskms = [ + boto3 + botocore + cryptography + ]; + azurekms = [ + azure-identity + azure-keyvault-keys + cryptography + ]; + crypto = [ + cryptography + ]; + gcpkms = [ + cryptography + google-cloud-kms + ]; + hsm = [ + asn1crypto + cryptography + # pykcs11 + ]; + pynacl = [ + pynacl + ]; + # Circular dependency + # sigstore = [ + # sigstore + # ]; + }; + + nativeCheckInputs = [ + ed25519 + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "securesystemslib" + ]; + + disabledTestPaths = [ + # pykcs11 is not available + "tests/test_hsm_signer.py" + # Ignore vendorized tests + "securesystemslib/_vendor/" + ]; + + meta = with lib; { + description = "Cryptographic and general-purpose routines"; + homepage = "https://github.com/secure-systems-lab/securesystemslib"; + changelog = "https://github.com/secure-systems-lab/securesystemslib/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/development/python-modules/shaperglot/default.nix b/pkgs/development/python-modules/shaperglot/default.nix new file mode 100644 index 0000000000000..f1ea7e5a723a3 --- /dev/null +++ b/pkgs/development/python-modules/shaperglot/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gflanguages +, num2words +, poetry-core +, protobuf +, pytestCheckHook +, strictyaml +, termcolor +, ufo2ft +, vharfbuzz +, youseedee +}: + +buildPythonPackage rec { + pname = "shaperglot"; + version = "0.3.1"; + + # PyPI source tarballs omit tests, fetch from Github instead + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "shaperglot"; + rev = "v${version}"; + hash = "sha256-29MzD42rgh+7n/0kjqKGDxXPnUEvj/xxEIKWZg03pxw="; + }; + + pyproject = true; + + propagatedBuildInputs = [ + gflanguages + num2words + protobuf + strictyaml + termcolor + ufo2ft + vharfbuzz + youseedee + ]; + nativeBuildInputs = [ + poetry-core + ]; + + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Tool to test OpenType fonts for language support"; + homepage = "https://github.com/googlefonts/shaperglot"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix new file mode 100644 index 0000000000000..be58c8b5f4cdd --- /dev/null +++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix @@ -0,0 +1,43 @@ +{ lib +, pythonOlder +, flit-core +, fetchPypi +, buildPythonPackage +, betterproto +}: + +buildPythonPackage rec { + pname = "sigstore-protobuf-specs"; + version = "0.2.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "sigstore_protobuf_specs"; + inherit version; + hash = "sha256-wFwedHioCvDH3qnMLRHwR4JuTAKVc9VkE394jhE3c5E="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + betterproto + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "sigstore_protobuf_specs" + ]; + + meta = with lib; { + description = "Library for serializing and deserializing Sigstore messages"; + homepage = "https://pypi.org/project/sigstore-protobuf-specs/"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix new file mode 100644 index 0000000000000..a58595ed19a9e --- /dev/null +++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix @@ -0,0 +1,41 @@ +{ lib +, pythonOlder +, pydantic +, flit-core +, fetchFromGitHub +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "sigstore-rekor-types"; + version = "0.0.11"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "sigstore-rekor-types"; + rev = "refs/tags/v${version}"; + hash = "sha256-oOFdRiDp9USc3A+aaPExprEO2i/RERNahiyi2kVpkns="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + pydantic + ] ++ pydantic.optional-dependencies.email; + + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Python models for Rekor's API types"; + homepage = "https://github.com/trailofbits/sigstore-rekor-types"; + changelog = "https://github.com/trailofbits/sigstore-rekor-types/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sre-yield/default.nix b/pkgs/development/python-modules/sre-yield/default.nix new file mode 100644 index 0000000000000..91e6904b57726 --- /dev/null +++ b/pkgs/development/python-modules/sre-yield/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "sre-yield"; + version = "1.2"; + + src = fetchPypi { + pname = "sre_yield"; + inherit version; + hash = "sha256-6U8aKjy6//4dzRXB1U5AGhUX4FKqZMfTFk+I3HYde4o="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + doCheck = true; + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + description = "Python library to efficiently generate all values that can match a given regular expression"; + homepage = "https://github.com/sre-yield/sre-yield"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/starline/default.nix b/pkgs/development/python-modules/starline/default.nix index ce7418a887342..cdaca053ee1da 100644 --- a/pkgs/development/python-modules/starline/default.nix +++ b/pkgs/development/python-modules/starline/default.nix @@ -2,20 +2,36 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch +, setuptools , requests }: buildPythonPackage rec { pname = "starline"; - version = "0.2.0"; + version = "0.1.5"; disabled = pythonOlder "3.5"; + pyproject = true; + src = fetchPypi { inherit pname version; - sha256 = "550b00ab95cf59d933f7708abab40a4e41e5790e62b653471afe86a3af3320e6"; + hash = "sha256-F1P1/NKml2rtd1r7A/g5IVnwQMZzkXzAxjRRDZXBPLk="; }; + patches = [ + # https://github.com/Anonym-tsk/starline/pull/5 + (fetchpatch { + url = "https://github.com/Anonym-tsk/starline/commit/4e6cdf8e05c5fb8509ee384e77b39a2495587160.patch"; + hash = "sha256-y9b6ePH3IEgmt3ALHQGwH102rlm4KfmH4oIoIC93cWU="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 73c36577413ab..a043430f8584c 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.28.2"; + version = "1.29.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wUQWiIG/e9bWAXqb/eWFtS0gCHsQstXIXTdu9tUqqO4="; + hash = "sha256-tt//nF4TLlUYySFQ781FKYDbSSpF+v6sPUaI0jNO+gc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stringbrewer/default.nix b/pkgs/development/python-modules/stringbrewer/default.nix new file mode 100644 index 0000000000000..fc39d515a6ec6 --- /dev/null +++ b/pkgs/development/python-modules/stringbrewer/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, rstr +, sre-yield +, pythonImportsCheckHook +}: + +buildPythonPackage rec { + pname = "stringbrewer"; + version = "0.0.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wtETgi+Tk1ALJzzIM6Ic5zkDbALGL0cELg8X75uepkk="; + }; + + propagatedBuildInputs = [ + rstr + sre-yield + ]; + nativeBuildInputs = [ + pythonImportsCheckHook + ]; + + # Package has no tests + doCheck = false; + pythonImportsCheck = [ "stringbrewer" ]; + + meta = with lib; { + description = "Python library to generate random strings matching a pattern"; + homepage = "https://github.com/simoncozens/stringbrewer"; + license = licenses.mit; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index a8482b18d56a4..48e2f79ef2d5f 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "0.6.1"; - format = "pyproject"; + version = "0.7.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rtcq"; - repo = pname; + repo = "syncedlyrics"; rev = "refs/tags/v${version}"; - hash = "sha256-oMG3TqCJfEyfF5zK8hNhyhQ1z7G+S+De8hI1GLCfctM="; + hash = "sha256-qZVUptmLouFFBCWiRviYFO0sQKlyz65GjWMg/b1idXY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index ff95c847eae5e..c8e292e316744 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -57,7 +57,8 @@ let # use compatible cuDNN (https://www.tensorflow.org/install/source#gpu) # cudaPackages.cudnn led to this: # https://github.com/tensorflow/tensorflow/issues/60398 - cudnn = cudaPackages.cudnn_8_6; + cudnnAttribute = "cudnn_8_6"; + cudnn = cudaPackages.${cudnnAttribute}; gentoo-patches = fetchzip { url = "https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.12.0.tar.bz2"; hash = "sha256-SCRX/5/zML7LmKEPJkcM5Tebez9vv/gmE4xhT/jyqWs="; @@ -65,15 +66,7 @@ let protobuf-extra = linkFarm "protobuf-extra" [ { name = "include"; path = protobuf-core.src; } ]; -in - -assert cudaSupport -> cudatoolkit != null - && cudnn != null; -# unsupported combination -assert ! (stdenv.isDarwin && cudaSupport); - -let withTensorboard = (pythonOlder "3.6") || tensorboardSupport; # FIXME: migrate to redist cudaPackages @@ -490,7 +483,11 @@ let license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; linux ++ darwin; - broken = stdenv.isDarwin || !(xlaSupport -> cudaSupport); + broken = + stdenv.isDarwin + || !(xlaSupport -> cudaSupport) + || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackages) + || !(cudaSupport -> cudaPackages ? cudatoolkit); } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index 3259f1fca1859..74eefd0718904 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -9,7 +9,6 @@ , future , numpy , autoPatchelfHook -, patchelf , pyyaml , requests , setuptools @@ -25,7 +24,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.0.1"; + version = "2.1.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 7b1cc4e18011d..42eed4485ebf3 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.0.1" = { + "2.1.1" = { x86_64-linux-38 = { - name = "torch-2.0.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-LOOKbk6nxLf1uqUeZSQ6X2h/bhmreRW6WypDEQX1C74="; + name = "torch-2.1.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-h8y2g+ZCqYuO8FRV722GRntiB1pDJfTV+aouiTL2Bzk="; }; x86_64-linux-39 = { - name = "torch-2.0.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-61XynbV0TtqKlvVZTmN9rtDVIngnMAXedZlw5nz6alo="; + name = "torch-2.1.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-KCRfYtEHPCfW8N4DqBrUnVMzxGBlke2I/tHtuX8FUz0="; }; x86_64-linux-310 = { - name = "torch-2.0.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-p6SdRZv0hi9k97waaL7M+IgcL6nz4FaWCOFrpvhev3s="; + name = "torch-2.1.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-7HbRE1DI6IejTTZgLNN/UGObyc2p+upNQ/IHDpeS5KQ="; }; x86_64-linux-311 = { - name = "torch-2.0.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-FDtsZYwX1DN24t+6osEG01Y51hXl6N7EQpzx5RDdjWE="; + name = "torch-2.1.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-g7/hE036irhlU8Fdpd/6GQqG2CKvr+jqbeEWnBDZcao="; }; x86_64-darwin-38 = { - name = "torch-2.0.1-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-Gttg02nyZQysjpqVsdV1jiXVJqNICPdEjQvVmeSukHI="; + name = "torch-2.1.1-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-1WsDIXZFjir0cJYnu9LCD+KRfv+M0Ien/jE6zM9c4vE="; }; x86_64-darwin-39 = { - name = "torch-2.0.1-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-xi35k1K9buWlqNGDJFIRBDXReLUWTeRQgxo6jMFNxoA="; + name = "torch-2.1.1-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-cVtQ2MHeXaVSSmgofrAA9z4CbnTV9rErxFDvaZX89fk="; }; x86_64-darwin-310 = { - name = "torch-2.0.1-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-Vn+E1lftxVgtcWkAVD5uYjU9videYc3DbtpJKeRt+ec="; + name = "torch-2.1.1-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp310-none-macosx_10_9_x86_64.whl"; + hash = "sha256-Hh5frd1DqPLA4OIr6s0eI1ouRHeU2AdIPJSp4xtUp1g="; }; x86_64-darwin-311 = { - name = "torch-2.0.1-cp311-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp311-none-macosx_10_9_x86_64.whl"; - hash = "sha256-72VEJ9kWABKYZGRONd7qdh+x/hMXEBgLlSpvLiIHB14="; + name = "torch-2.1.1-cp311-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp311-none-macosx_10_9_x86_64.whl"; + hash = "sha256-pwWTgG8dfmtTZX2WgQUY2g+I7yYIyYpAKVV2W4x51Sw="; }; aarch64-darwin-38 = { - name = "torch-2.0.1-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-G8/8FrieKWgmszuY21Fm+ZDjtyZUorkGc+gXsWxQ4ys="; + name = "torch-2.1.1-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-KeO5CowoH2ZggEqTnR9CGGBMgBYuUh4ebYyFVzJZAqA="; }; aarch64-darwin-39 = { - name = "torch-2.0.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-ZxolZeP2O4/o5Crj42rSSf5eVnQ16ie5TtqmcqfQxBY="; + name = "torch-2.1.1-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-22foclx29Mf08C51UbsW6BuhoZEoZ7w117uW0r6MeLQ="; }; aarch64-darwin-310 = { - name = "torch-2.0.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-eHtaeKp5F0Zem5Y5m4g5IMiKCPTrY7Wl0tGhbifS+Js="; + name = "torch-2.1.1-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-52vzxcNUh08dpGXIUqL7YO5svOMG6TUzeIV2DwgPm6o="; }; aarch64-darwin-311 = { - name = "torch-2.0.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-JapDyoDc3zLxPaBMUD7Hr9+Od+OgGD3YXNPlOyhC5Sc="; + name = "torch-2.1.1-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-4xL36C5JVl92Z7C7+VWasMWXBj2TBEdAeBwCrNWoeXg="; }; aarch64-linux-38 = { - name = "torch-2.0.1-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torch-2.0.1-cp38-cp38-manylinux2014_aarch64.whl"; - hash = "sha256-CIIkN1X/KIlejm3GvCbrz1qgkR7YGyoS8kH8SwkHWxM="; + name = "torch-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-nKD8vz1bpkTWqFcsg6mrvfX3/1dbw4Up72wYWjpxvek="; }; aarch64-linux-39 = { - name = "torch-2.0.1-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torch-2.0.1-cp39-cp39-manylinux2014_aarch64.whl"; - hash = "sha256-Qj4K4le3VrtFpLSQcgRnctGtDFkiZcUIAHDgdn2k5JA="; + name = "torch-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-sxIwvQWEJOVtun+JkoDbxqyLmUjkOQLgyEpEZmsewVE="; }; aarch64-linux-310 = { - name = "torch-2.0.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torch-2.0.1-cp310-cp310-manylinux2014_aarch64.whl"; - hash = "sha256-NZv6rZTRzaAqt3XcHMOG1YVxIym7R7h0FgfvbvSVB0c="; + name = "torch-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-hP79YzVkFsDNIFeGN8zbuCFkmTQA7Re1fJUd1jdtzug="; }; aarch64-linux-311 = { - name = "torch-2.0.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torch-2.0.1-cp311-cp311-manylinux2014_aarch64.whl"; - hash = "sha256-tgGbHeSXjpbaoh1qPrtB6IoLR0iY/iUf2WGJWHQIhz4="; + name = "torch-2.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-YbUbM8YXN8KHBYsMMGHmqdPDY4Y+SglPgEvEhoiKGIo="; }; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index dae916a185259..d18dd97df5b45 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -20,6 +20,7 @@ Accelerate, CoreServices, libobjc, # Propagated build inputs + fsspec, filelock, jinja2, networkx, @@ -55,10 +56,7 @@ let inherit (lib) attrsets lists strings trivial; - inherit (cudaPackages) cudaFlags cudnn; - - # Some packages are not available on all platforms - nccl = cudaPackages.nccl or null; + inherit (cudaPackages) cudaFlags cudnn nccl; setBool = v: if v then "1" else "0"; @@ -127,7 +125,7 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.0.1"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.8.0"; @@ -143,10 +141,13 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-xUj77yKz3IQ3gd/G32pI4OhL3LoN1zS7eFg0/0nZp5I="; + hash = "sha256-01+uqHvPbQVXKLohGWfsCsZOjb7xmfjBKkTGUGMEdAI="; }; - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + patches = lib.optionals cudaSupport [ + ./fix-cmake-cuda-toolkit.patch + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current @@ -188,12 +189,11 @@ in buildPythonPackage rec { 'message(FATAL_ERROR "Found NCCL header version and library version' \ 'message(WARNING "Found NCCL header version and library version' '' - # TODO(@connorbaker): Remove this patch after 2.1.0 lands. + # Remove PyTorch's FindCUDAToolkit.cmake and to use CMake's default. + # We do not remove the entirety of cmake/Modules_CUDA_fix because we need FindCUDNN.cmake. + lib.optionalString cudaSupport '' - substituteInPlace torch/utils/cpp_extension.py \ - --replace \ - "'8.6', '8.9'" \ - "'8.6', '8.7', '8.9'" + rm cmake/Modules/FindCUDAToolkit.cmake + rm -rf cmake/Modules_CUDA_fix/{upstream,FindCUDA.cmake} '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. @@ -209,10 +209,11 @@ in buildPythonPackage rec { # For more, see https://github.com/open-mpi/ompi/issues/7733#issuecomment-629806195. preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" - export CUDNN_INCLUDE_DIR=${cudnn.dev}/include - export CUDNN_LIB_DIR=${cudnn.lib}/lib export CUPTI_INCLUDE_DIR=${cudaPackages.cuda_cupti.dev}/include export CUPTI_LIBRARY_DIR=${cudaPackages.cuda_cupti.lib}/lib + '' + lib.optionalString (cudaSupport && cudaPackages ? cudnn) '' + export CUDNN_INCLUDE_DIR=${cudnn.dev}/include + export CUDNN_LIB_DIR=${cudnn.lib}/lib '' + lib.optionalString rocmSupport '' export ROCM_PATH=${rocmtoolkit_joined} export ROCM_SOURCE_DIR=${rocmtoolkit_joined} @@ -270,7 +271,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; - USE_NCCL = setBool (nccl != null); + USE_NCCL = setBool (cudaPackages ? nccl); USE_SYSTEM_NCCL = setBool useSystemNccl; # don't build pytorch's third_party NCCL USE_STATIC_NCCL = setBool useSystemNccl; @@ -345,8 +346,6 @@ in buildPythonPackage rec { cuda_nvrtc.lib cuda_nvtx.dev cuda_nvtx.lib # -llibNVToolsExt - cudnn.dev - cudnn.lib libcublas.dev libcublas.lib libcufft.dev @@ -357,7 +356,10 @@ in buildPythonPackage rec { libcusolver.lib libcusparse.dev libcusparse.lib - ] ++ lists.optionals (nccl != null) [ + ] ++ lists.optionals (cudaPackages ? cudnn) [ + cudnn.dev + cudnn.lib + ] ++ lists.optionals (useSystemNccl && cudaPackages ? nccl) [ # Some platforms do not support NCCL (i.e., Jetson) nccl.dev # Provides nccl.h AND a static copy of NCCL! ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ @@ -377,6 +379,7 @@ in buildPythonPackage rec { pyyaml # From install_requires: + fsspec filelock typing-extensions sympy diff --git a/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch b/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch new file mode 100644 index 0000000000000..508118cc2e8ad --- /dev/null +++ b/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch @@ -0,0 +1,65 @@ +From aa7e7cfd5a5fe0c839406c1b197b81ef955a7ef5 Mon Sep 17 00:00:00 2001 +From: Gaetan Lepage <gaetan@glepage.com> +Date: Thu, 23 Nov 2023 00:39:26 +0100 +Subject: [PATCH] fix-cmake-cuda-toolkit + +--- + CMakeLists.txt | 4 ---- + cmake/public/cuda.cmake | 12 +++++++++--- + tools/setup_helpers/cmake.py | 2 ++ + 3 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a48eaf4e29..3aaeef2593a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1152,10 +1152,6 @@ if(BUILD_SHARED_LIBS) + ${PROJECT_SOURCE_DIR}/cmake/Modules_CUDA_fix + DESTINATION share/cmake/Caffe2/ + COMPONENT dev) +- install(FILES +- ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUDAToolkit.cmake +- DESTINATION share/cmake/Caffe2/ +- COMPONENT dev) + install(FILES + ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUSPARSELT.cmake + DESTINATION share/cmake/Caffe2/ +diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake +index 32f3ba375b5..c8b666e4c78 100644 +--- a/cmake/public/cuda.cmake ++++ b/cmake/public/cuda.cmake +@@ -62,9 +62,15 @@ cmake_policy(POP) + + if(NOT CMAKE_CUDA_COMPILER_VERSION STREQUAL CUDAToolkit_VERSION OR + NOT CUDA_INCLUDE_DIRS STREQUAL CUDAToolkit_INCLUDE_DIR) +- message(FATAL_ERROR "Found two conflicting CUDA installs:\n" +- "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n" +- "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIR}'") ++ if(CUDA_INCLUDE_DIRS IN_LIST CUDAToolkit_INCLUDE_DIR) ++ message(STATUS "CUDA_INCLUDE_DIRS is a substring of CUDAToolkit_INCLUDE_DIR. " ++ "Setting CUDA_INCLUDE_DIRS to CUDAToolkit_INCLUDE_DIR.") ++ set(CUDA_INCLUDE_DIRS "${CUDAToolkit_INCLUDE_DIR}") ++ else() ++ message(FATAL_ERROR "Found two conflicting CUDA installs:\n" ++ "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n" ++ "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIR}'") ++ endif() + endif() + + if(NOT TARGET CUDA::nvToolsExt) +diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py +index fb19b66dfba..3f83bef32fe 100644 +--- a/tools/setup_helpers/cmake.py ++++ b/tools/setup_helpers/cmake.py +@@ -207,6 +207,8 @@ class CMake: + "BUILDING_WITH_TORCH_LIBS", + "CUDA_HOST_COMPILER", + "CUDA_NVCC_EXECUTABLE", ++ "CUDAToolkit_ROOT", ++ "CUDAToolkit_INCLUDE_DIR", + "CUDA_SEPARABLE_COMPILATION", + "CUDNN_LIBRARY", + "CUDNN_INCLUDE_DIR", +-- +2.42.0 + diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/prefetch.sh index be3e4ec755bd1..7b9c26de35f25 100755 --- a/pkgs/development/python-modules/torch/prefetch.sh +++ b/pkgs/development/python-modules/torch/prefetch.sh @@ -5,9 +5,9 @@ set -eou pipefail version=$1 -linux_cuda_version="cu118" +linux_cuda_version="cu121" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" -linux_cpu_bucket="https://download.pytorch.org/whl" +linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( @@ -23,10 +23,10 @@ url_and_key_list=( "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux2014_aarch64.whl" - "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux2014_aarch64.whl" - "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux2014_aarch64.whl" - "aarch64-linux-311 $linux_cpu_bucket/torch-${version}-cp311-cp311-manylinux2014_aarch64.whl torch-${version}-cp311-cp311-manylinux2014_aarch64.whl" + "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "aarch64-linux-311 $linux_cpu_bucket/torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" ) hashfile="binary-hashes-$version.nix" diff --git a/pkgs/development/python-modules/torchaudio/0001-setup.py-propagate-cmakeFlags.patch b/pkgs/development/python-modules/torchaudio/0001-setup.py-propagate-cmakeFlags.patch new file mode 100644 index 0000000000000..a1f6b5ea8aeb7 --- /dev/null +++ b/pkgs/development/python-modules/torchaudio/0001-setup.py-propagate-cmakeFlags.patch @@ -0,0 +1,32 @@ +From 789ec77d09171f22d82006493cafbcf2496b4f8f Mon Sep 17 00:00:00 2001 +From: Someone Serge <sergei.kozlukov@aalto.fi> +Date: Sat, 2 Dec 2023 12:47:00 +0000 +Subject: [PATCH] setup.py: propagate cmakeFlags + +--- + tools/setup_helpers/extension.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tools/setup_helpers/extension.py b/tools/setup_helpers/extension.py +index 2415bbae..7c2a9351 100644 +--- a/tools/setup_helpers/extension.py ++++ b/tools/setup_helpers/extension.py +@@ -1,6 +1,7 @@ + import distutils.sysconfig + import os + import platform ++import shlex + import subprocess + from pathlib import Path + +@@ -141,6 +142,8 @@ class CMakeBuild(build_ext): + f"-DUSE_OPENMP:BOOL={'ON' if _USE_OPENMP else 'OFF'}", + f"-DUSE_FFMPEG:BOOL={'ON' if _USE_FFMPEG else 'OFF'}", + ] ++ if "cmakeFlags" in os.environ: ++ cmake_args.extend(shlex.split(os.environ["cmakeFlags"])) + build_args = ["--target", "install"] + # Pass CUDA architecture to cmake + if _TORCH_CUDA_ARCH_LIST is not None: +-- +2.42.0 diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index ec2e680e948e6..5ad263a8df677 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -6,6 +6,9 @@ , cudaPackages , fetchurl , ffmpeg_4 +, ffmpeg_5 +, ffmpeg_6 +, sox , pythonAtLeast , pythonOlder , python @@ -14,7 +17,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.0.2"; + version = "2.1.1"; format = "wheel"; src = @@ -35,7 +38,11 @@ buildPythonPackage rec { # libnvToolsExt-$hash.so.1 cuda_nvtx - ffmpeg_4.lib + # We need to patch the lib/_torchaudio_ffmpeg[4-6] + ffmpeg_4.dev + ffmpeg_5.dev + ffmpeg_6.dev + sox ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 35bc1cfce930d..21241253da3ff 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.0.2" = { + "2.1.1" = { x86_64-linux-38 = { - name = "torchaudio-2.0.2-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.2%2Bcu118-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-lU3njk8Gb+lvpvQYtfHX1Y0bD7z2otNzDwQaL9eW93I="; + name = "torchaudio-2.1.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-GM8TlEbiLP2K+jglzkkvPPEf00LxcI7o9K+EtIKLTGA="; }; x86_64-linux-39 = { - name = "torchaudio-2.0.2-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.2%2Bcu118-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-MixBw26OYv03qzURSmeSGuVCvNlA1YPNE+DhUUHISPk="; + name = "torchaudio-2.1.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-4YdH1mdew+TFmvpA23Lp5+pNcVy5KxQ9pV31lhPAPTA="; }; x86_64-linux-310 = { - name = "torchaudio-2.0.2-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.2%2Bcu118-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-JmkmReoGGgBcV+xYGi0EJSEKxrqfkj7fEcybDvOhEek="; + name = "torchaudio-2.1.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-7/gmDgL4imlKlksrtvY3pq8xB3h9kH6uflgBgWAzv6c="; }; x86_64-linux-311 = { - name = "torchaudio-2.0.2-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.2%2Bcu118-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-e8C1Cg2DokvcORYnDCOTQ0WshDUd92vTuwiDS9snHfY="; + name = "torchaudio-2.1.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-qq2dkQ5CDBlVsIpa8yatlplLitDQWW/L9gGxVYDof6c="; }; x86_64-darwin-38 = { - name = "torchaudio-2.0.2-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp38-cp38-macosx_10_9_x86_64.whl"; - hash = "sha256-qCg91hxXnqWxTWdzu8C/hFc7ErN/BfArtLJCXXd2coQ="; + name = "torchaudio-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-b8d8SNB5zSbvQMYTqm8xxcePD4FiEWYqJ4Vsf1RPHMw="; }; x86_64-darwin-39 = { - name = "torchaudio-2.0.2-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp39-cp39-macosx_10_9_x86_64.whl"; - hash = "sha256-ETihw52iRFocrKIN3OHnfJZX6SJj6zQ3YCT1F/UoTUs="; + name = "torchaudio-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-f/BYndc9vepm7SHIF8ttHvjs0+6EmXrqf8DjUroWjkg="; }; x86_64-darwin-310 = { - name = "torchaudio-2.0.2-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp310-cp310-macosx_10_9_x86_64.whl"; - hash = "sha256-gMZNq7nYwzvG8qjgx+vhfqh/UCiTHA1qL3O54WtSctA="; + name = "torchaudio-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-JPpYcPYgmU5FiEUtVO3LL/tfUJ1+42ugToxo6yiv/Io="; }; x86_64-darwin-311 = { - name = "torchaudio-2.0.2-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp311-cp311-macosx_10_9_x86_64.whl"; - hash = "sha256-psuoDZqzouwTF83Fy8BlShiaJuPYso75+DM2FZ/V5ek="; + name = "torchaudio-2.1.1-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-7j9/B9sCOprjYGpjDbRyJ+d/IOYEyZQGdnzsWKE5uW4="; }; aarch64-darwin-38 = { - name = "torchaudio-2.0.2-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-KMm+gwYI+TyQZ3Dre0iAli+P75vVJ1rFtIyFDzzEvDI="; + name = "torchaudio-2.1.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-L+SgvGuooE9xrLxmT93CtzY3y/G+NFxkM0KprtNDVDo="; }; aarch64-darwin-39 = { - name = "torchaudio-2.0.2-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-3l2Uy4MFwAJo37xXbKfkRfQIkeAkqeXijGOtn4UeVBo="; + name = "torchaudio-2.1.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-VwmUP7JnXIVDvrYfAz+50AGr8VXxUJrzPhO8uD9UPQo="; }; aarch64-darwin-310 = { - name = "torchaudio-2.0.2-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-FhlnNQD+CK6WtxlS8D7Px059CEPNmIIZPQZCqCck9Tc="; + name = "torchaudio-2.1.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-fNRlvgb9OHNq2n1MCG8M3SSd4ot1ddEDXOJd+ziW+kw="; }; aarch64-darwin-311 = { - name = "torchaudio-2.0.2-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-FTJxMrKPNJY7qm/hgTAwpjTSWBqpyhIPcwwej6vcEQI="; + name = "torchaudio-2.1.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-+tHGDPveoxu7KgDk0fFTYEYG3N00vJdPQ8YvpuJpYns="; }; aarch64-linux-38 = { - name = "torchaudio-2.0.2-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.0.2-cp38-cp38-manylinux2014_aarch64.whl"; - hash = "sha256-7gjsMDBQQFmY50oKNkmu5NFkCMLrS7H4x6cmMYsc4bc="; + name = "torchaudio-2.1.1-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-bnhAF5QfPoGtvvJGIkqT1eXSZocF3NxFlWZo3nuiLTI="; }; aarch64-linux-39 = { - name = "torchaudio-2.0.2-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.0.2-cp39-cp39-manylinux2014_aarch64.whl"; - hash = "sha256-p08z2gs8U7dw9YOgLKvVkZbwift3pl6znNXYEbWiHWM="; + name = "torchaudio-2.1.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-FXE1qdeNwSe7J0XEZUqn6hQd3Huzn8rSHf+Oq6VXihQ="; }; aarch64-linux-310 = { - name = "torchaudio-2.0.2-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.0.2-cp310-cp310-manylinux2014_aarch64.whl"; - hash = "sha256-2t8je0/RVaPSE73+/+3tR/WlU9ODgXUAQ4tE8k+lOFE="; + name = "torchaudio-2.1.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-dK3UoOX6BJmO1SoBN9Ox2cKtJdqCEsRt8O1z+h0Uanc="; }; aarch64-linux-311 = { - name = "torchaudio-2.0.2-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.0.2-cp311-cp311-manylinux2014_aarch64.whl"; - hash = "sha256-sirOqh7FozEMwVZC0Z3QDVOnzjmbkJatHeoLJOUJevM="; + name = "torchaudio-2.1.1-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-6toEKY1TfF0CddoRIsRxmMF31CYetaXSI24Rqg6FyB8="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 0b38925e0a2b9..1014ab523821a 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -2,9 +2,12 @@ , buildPythonPackage , fetchFromGitHub , cmake +, symlinkJoin +, ffmpeg-full , pkg-config , ninja , pybind11 +, sox , torch , cudaSupport ? torch.cudaSupport , cudaPackages @@ -12,15 +15,19 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.0.2"; + version = "2.1.1"; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; - rev = "v${version}"; - hash = "sha256-9lB4gLXq0nXHT1+DNOlbJQqNndt2I6kVoNwhMO/2qlE="; + rev = "refs/tags/v${version}"; + hash = "sha256-5UlnOGXXFu1p9M5B+Ixc9DW5hLZ1nskv81Y+McbWu6Q="; }; + patches = [ + ./0001-setup.py-propagate-cmakeFlags.patch + ]; + postPatch = '' substituteInPlace setup.py \ --replace 'print(" --- Initializing submodules")' "return" \ @@ -31,6 +38,16 @@ buildPythonPackage rec { TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}"; }; + # https://github.com/pytorch/audio/blob/v2.1.0/docs/source/build.linux.rst#optional-build-torchaudio-with-a-custom-built-ffmpeg + FFMPEG_ROOT = symlinkJoin { + name = "ffmpeg"; + paths = [ + ffmpeg-full.bin + ffmpeg-full.dev + ffmpeg-full.lib + ]; + }; + nativeBuildInputs = [ cmake pkg-config @@ -38,8 +55,11 @@ buildPythonPackage rec { ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + buildInputs = [ + ffmpeg-full pybind11 + sox ] ++ lib.optionals cudaSupport [ cudaPackages.libcurand.dev cudaPackages.libcurand.lib @@ -52,6 +72,7 @@ buildPythonPackage rec { cudaPackages.libcufft.dev cudaPackages.libcufft.lib ]; + propagatedBuildInputs = [ torch ]; diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 0777d3f2b56aa..c0be5710121b2 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -5,7 +5,7 @@ set -eou pipefail version=$1 -linux_cuda_version="cu118" +linux_cuda_version="cu121" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" linux_cpu_bucket="https://download.pytorch.org/whl" darwin_bucket="https://download.pytorch.org/whl/cpu" @@ -15,18 +15,18 @@ url_and_key_list=( "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" - "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" - "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" - "x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" + "x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl" "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" - "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" - "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" - "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" + "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" + "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" + "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" ) hashfile=binary-hashes-"$version".nix diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index ee66ee817d1f7..9b980206c32a9 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -20,7 +20,7 @@ let pname = "torchmetrics"; - version = "1.2.0"; + version = "1.2.1"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-g5JuTbiRd8yWx2nM3UE8ejOhuZ0XpAQdS5AC9AlrSFY="; + hash = "sha256-uvebKCJL2TSQUGmtVE1MtYwzgs+0lWvHvsN5PwJyl/g="; }; disabled = pythonOlder "3.8"; @@ -90,6 +90,7 @@ buildPythonPackage { meta = with lib; { description = "Machine learning metrics for distributed, scalable PyTorch applications (used in pytorch-lightning)"; homepage = "https://lightning.ai/docs/torchmetrics/"; + changelog = "https://github.com/Lightning-AI/torchmetrics/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ SomeoneSerge diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index e1ec53671141d..574476ef87772 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.15.2"; + version = "0.16.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index abcb5780bf478..f560d78baaa4d 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,66 +6,66 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.15.2" = { + "0.16.1" = { x86_64-linux-38 = { - name = "torchvision-0.15.2-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.2%2Bcu118-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-r2gH1eWZ/lOByRYjWlWBQH6FDrd8PUOJnzehUR/4HMA="; + name = "torchvision-0.16.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-xPO1sRtw2yyLBlrp3kduqc6yrVc8fFgGi+CXWkABgrQ="; }; x86_64-linux-39 = { - name = "torchvision-0.15.2-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.2%2Bcu118-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-8sb1oQC8+QILgvXUyHzX4mrwQJzzO5D7eXsRJ9zULeY="; + name = "torchvision-0.16.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-1voLyIMnBZI9kBleyb819IhwW0nAFEizcCy3t9ebVPk="; }; x86_64-linux-310 = { - name = "torchvision-0.15.2-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.2%2Bcu118-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-GcpKtdYXm75Tz/ed8ahV7mUzwoYd3HOJ9oNJ2Ln4MCo="; + name = "torchvision-0.16.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-AglL7N9dxCpq/iGQ4ayz8y3ZwtOt2Cfd/pG1RMwjrfQ="; }; x86_64-linux-311 = { - name = "torchvision-0.15.2-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.2%2Bcu118-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-3vmvR+vCytVcWqLa0SMNz0Jhgz7W34pz6Dm8Izdk8J4="; + name = "torchvision-0.16.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-tO7B2cBOsDa05yrqX0OuM8BkFNqdNjkb0E/9Ma2C+6k="; }; x86_64-darwin-38 = { - name = "torchvision-0.15.2-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.2-cp38-cp38-macosx_10_9_x86_64.whl"; - hash = "sha256-jxJBW2htuohPsIb1OsgD9pK+WlzdinWPUIErMP/+ouQ="; + name = "torchvision-0.16.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-TyytYh+5bPEOKa+T4WyYsyJr3VOucStX6HPD3q8GFhc="; }; x86_64-darwin-39 = { - name = "torchvision-0.15.2-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.2-cp39-cp39-macosx_10_9_x86_64.whl"; - hash = "sha256-R5AmD89HikHH7MYKbVIAqIFZ/djXVunynw+MWcSmemg="; + name = "torchvision-0.16.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-8U0gHDcXbcQQbux2sinWWFoVBSZrjOqZ0zZv04iXt8A="; }; x86_64-darwin-310 = { - name = "torchvision-0.15.2-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.2-cp310-cp310-macosx_10_9_x86_64.whl"; - hash = "sha256-d1QIh3ToEMVnKxQqRdzyCxvZhqWn2pD4ZgxD3EP7hQw="; + name = "torchvision-0.16.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-mHEyeV5cA3y3TnvjWmk5mf2y9gMVImbuFbgCBug6Www="; }; x86_64-darwin-311 = { - name = "torchvision-0.15.2-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.2-cp311-cp311-macosx_10_9_x86_64.whl"; - hash = "sha256-XzX2vVvMRWjmUi5BN/pg/McvT6PmFTIcJs2H6FWs05g="; + name = "torchvision-0.16.1-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-Supc9JHGwhscvbsb8qODilnU25OtX0kBmmVk08pxJ8c="; }; aarch64-darwin-38 = { - name = "torchvision-0.15.2-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.2-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-MSEcAfi47DO4pjgye1RjIS55oD5DyJX4gEn5evG9Ev0="; + name = "torchvision-0.16.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-HWFLPJ4t6c11zA5OGSP8+7zZ/bnwigu7v34TXkoKHPo="; }; aarch64-darwin-39 = { - name = "torchvision-0.15.2-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.2-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-mHq2IiW0FRoR5T/QYVDFJYztJKydfFR+Dkq2+8qSpc4="; + name = "torchvision-0.16.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-oV6IqTp1Acx1t2Gi3NB6rtqvnL+vSMiv+oyYmJ7LsZ0="; }; aarch64-darwin-310 = { - name = "torchvision-0.15.2-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.2-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-N+sTjhP2ISU3owCawhhpVIOmNcQEtswdjg0Nl4AmqG0="; + name = "torchvision-0.16.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-JdpqeyLqA0j2LEXsDa8VdzEJa6vK5l0iJAQIGvluCFw="; }; aarch64-darwin-311 = { - name = "torchvision-0.15.2-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.2-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-dXUFoKsr5wlsudK/RyMgLJcczt23LHlSp+h393PeD4o="; + name = "torchvision-0.16.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-M5F1cWdjes4+8zpnydXvhrH4y9k+qlutRe688mbqYIk="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 401e415e2812a..223130918af59 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -40,7 +40,7 @@ let }; pname = "torchvision"; - version = "0.15.2"; + version = "0.16.1"; in buildPythonPackage { inherit pname version; @@ -49,7 +49,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-KNbOgd6PCINZqZ24c/Ev+ODux3ik5iUlzem9uUfQArM="; + hash = "sha256-TsYBDtedTQ3+F3LM4JwzkGH2XOr0WSp1Au5YoR07rSA="; }; nativeBuildInputs = [ libpng ninja which ] ++ lib.optionals cudaSupport [ cuda-native-redist ]; diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 17dd15f6742e3..e80718a50530e 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -5,7 +5,7 @@ set -eou pipefail version=$1 -linux_cuda_version="cu118" +linux_cuda_version="cu121" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl/cpu" @@ -14,10 +14,10 @@ url_and_key_list=( "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl" - "x86_64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl" - "x86_64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl" - "x86_64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl" + "x86_64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl" "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" diff --git a/pkgs/development/python-modules/tuf/default.nix b/pkgs/development/python-modules/tuf/default.nix new file mode 100644 index 0000000000000..b6965a7f42e25 --- /dev/null +++ b/pkgs/development/python-modules/tuf/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, ed25519 +, fetchFromGitHub +, hatchling +, pytestCheckHook +, pythonOlder +, requests +, securesystemslib +}: + +buildPythonPackage rec { + pname = "tuf"; + version = "3.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "theupdateframework"; + repo = "python-tuf"; + rev = "refs/tags/v${version}"; + hash = "sha256-IGF/8RdX7Oxl6gdqPGN1w/6q4zaei+MnYXBZepB4KUA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "hatchling==" "hatchling>=" + ''; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + requests + securesystemslib + ] ++ securesystemslib.optional-dependencies.pynacl + ++ securesystemslib.optional-dependencies.crypto; + + nativeCheckInputs = [ + ed25519 + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tuf" + ]; + + preCheck = '' + cd tests + ''; + + meta = with lib; { + description = "Python reference implementation of The Update Framework (TUF)"; + homepage = "https://github.com/theupdateframework/python-tuf"; + changelog = "https://github.com/theupdateframework/python-tuf/blob/v${version}/docs/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index c1acef68d19a5..03da40472d5ba 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "23.5.0"; + version = "23.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k/2Aqd1QX2mNCGT+k9uLapwRRLX+uRUwggtw7YmCZRw="; + hash = "sha256-cfha6T121yZRAFnJ7XTmCLxaXJ99EDhTtJ5BQoBAai8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 55fe29e972a83..214f7cf4d1abf 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -24,7 +24,7 @@ let in buildPythonPackage rec { pname = "type-infer"; - version = "0.0.15"; + version = "0.0.16"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "type_infer"; inherit version; - hash = "sha256-AnThYE6hHc3Pwu8fl0VBiQJfGVjeEKo4RrCsOl2pfCA="; + hash = "sha256-EWH8odCHAzrEcBtFEYBm5gt4zlrwrK33c6uEfFBgPfA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index 44f025c23c1a2..5e87bd726bf74 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-tng+wpElwAtWCzVNL+KhhdxcznahfCOsLWMGdK+nAEA="; + hash = "sha256-LkF1b8+Ud1qZSa+oVkiaxFcDCGCbBJPfvXtNMz60I+Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index e9ab0bc6abe35..4f74b552b0c4d 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -4,32 +4,25 @@ , pythonOlder , fetchPypi , setuptools -, wheel -, pytz-deprecation-shim , pytest-mock , pytestCheckHook }: buildPythonPackage rec { pname = "tzlocal"; - version = "5.0.1"; # version needs to be compatible with APScheduler + version = "5.2"; # version needs to be compatible with APScheduler - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RuuZrUvbcfP3K30k9CZ3U+JAlE7PwW8l0nGbqJgnqAM="; + hash = "sha256-jTmSBVePGpNCgWQJzB5GqT69V1XjnqLYUzS+qRG/Dm4="; }; nativeBuildInputs = [ setuptools - wheel - ]; - - propagatedBuildInputs = [ - pytz-deprecation-shim ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/development/python-modules/ufolint/default.nix new file mode 100644 index 0000000000000..c7b666c37fab3 --- /dev/null +++ b/pkgs/development/python-modules/ufolint/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, commandlines +, fonttools +, fs +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ufolint"; + version = "1.2.0"; + + # PyPI source tarballs omit tests, fetch from Github instead + src = fetchFromGitHub { + owner = "source-foundry"; + repo = "ufolint"; + rev = "v${version}"; + hash = "sha256-sv8WbnDd2LFHkwNsB9FO04OlLhemdzwjq0tC9+Fd6/M="; + }; + + propagatedBuildInputs = [ + commandlines + fs + fonttools + ]; + + doCheck = true; + nativeBuildInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Linter for Unified Font Object (UFO) source code"; + homepage = "https://github.com/source-foundry/ufolint"; + license = licenses.mit; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/vharfbuzz/default.nix b/pkgs/development/python-modules/vharfbuzz/default.nix new file mode 100644 index 0000000000000..fb953a0e7be7d --- /dev/null +++ b/pkgs/development/python-modules/vharfbuzz/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fonttools +, pythonImportsCheckHook +, uharfbuzz +}: + +buildPythonPackage rec { + pname = "vharfbuzz"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-uDX2fYqxV4wmAAIMfA3dBohWmq1N0VurSTEFOjSRpmY="; + }; + + propagatedBuildInputs = [ + fonttools + uharfbuzz + ]; + nativeBuildInputs = [ + pythonImportsCheckHook + ]; + + # Package has no tests. + doCheck = false; + pythonImportsCheck = [ "vharfbuzz" ]; + + meta = with lib; { + description = "Utility for removing hinting data from TrueType and OpenType fonts"; + homepage = "https://github.com/source-foundry/dehinter"; + license = licenses.asl20; + maintainers = with maintainers; [ danc86 ]; + }; +} + diff --git a/pkgs/development/python-modules/vprof/default.nix b/pkgs/development/python-modules/vprof/default.nix new file mode 100644 index 0000000000000..1f41f7b9a2031 --- /dev/null +++ b/pkgs/development/python-modules/vprof/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, psutil +}: + +buildPythonPackage rec { + pname = "vprof"; + version = "0.38"; + pyproject = true; + + # We use the Pypi source rather than the GitHub ones because the former include the javascript + # dependency for the UI. + src = fetchPypi { + inherit pname version; + hash = "sha256-fxAAkS7rekUMfJTTzJZzmvRa0P8B1avMCwmhddQP+ts="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + psutil + ]; + + pythonImportsCheck = [ "vprof" ]; + + # The tests are not included in the Pypi sources + doCheck = false; + + meta = with lib; { + description = "Visual profiler for Python"; + homepage = "https://github.com/nvdv/vprof"; + license = licenses.bsd2; + maintainers = with maintainers; [ GaetanLepage ]; + mainProgram = "vprof"; + }; +} diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index d4a04317ad800..7ae231f03f893 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.19.6"; + version = "1.19.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zrdR4KuORCGIoRTZDednT9JDV/seWQRa3aPal8gxdTE="; + hash = "sha256-MK//Q5m4PeNioRsmxHaMbN2x7a4SkgVy0xkxuvnUufo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 7db56a0d617a5..c5664846dcfc5 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.32.0"; + version = "1.33.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "adrienverge"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DtIQ/gUBFQBm0OOJC2c/ONn2ZKsMAzdwMx7FbUo+uIU="; + hash = "sha256-hWN5PhEAhckp250Dj7h5PpyH/E1jCi38O4VmMYgPtzE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch new file mode 100644 index 0000000000000..26af7ad24c92f --- /dev/null +++ b/pkgs/development/python-modules/youseedee/0001-use-packaged-unicode-data.patch @@ -0,0 +1,25 @@ +From 9013d36cfe7b2958eb18ce373f49193b66a0bbf6 Mon Sep 17 00:00:00 2001 +From: Dan Callaghan <djc@djc.id.au> +Date: Sun, 23 Apr 2023 16:14:55 +1000 +Subject: [PATCH] use packaged unicode data + + +diff --git a/lib/youseedee/__init__.py b/lib/youseedee/__init__.py +index 4424ef1..9a72f52 100644 +--- a/lib/youseedee/__init__.py ++++ b/lib/youseedee/__init__.py +@@ -11,10 +11,7 @@ + UCD_URL = "https://unicode.org/Public/UCD/latest/ucd/UCD.zip" + + def ucd_dir(): +- ucddir = os.path.expanduser("~/.youseedee") +- if not os.path.isdir(ucddir): +- os.mkdir(ucddir) +- return ucddir ++ return "@ucd_dir@" + + def ensure_files(): + if os.path.isfile(os.path.join(ucd_dir(), "UnicodeData.txt")): +-- +2.38.4 + diff --git a/pkgs/development/python-modules/youseedee/default.nix b/pkgs/development/python-modules/youseedee/default.nix new file mode 100644 index 0000000000000..65a98c350b283 --- /dev/null +++ b/pkgs/development/python-modules/youseedee/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, substituteAll +, requests +, unicode-character-database +}: + +buildPythonPackage rec { + pname = "youseedee"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-fdI4CBUSMbdKW0qg4y22wjWI6bhotgDkQdFMc9X00as="; + }; + + patches = [ + # Load data files from the unicode-character-database package instead of + # downloading them from the internet. (nixpkgs-specific, not upstreamable) + (substituteAll { + src = ./0001-use-packaged-unicode-data.patch; + ucd_dir = "${unicode-character-database}/share/unicode"; + }) + ]; + + propagatedBuildInputs = [ + requests + ]; + + doCheck = true; + # Package has no unit tests, but we can check an example as per README.rst: + checkPhase = '' + runHook preCheck + python -m youseedee 0x078A | grep -q "'Block': 'Thaana'" + runHook postCheck + ''; + + meta = with lib; { + description = "Python library for querying the Unicode Character Database"; + homepage = "https://github.com/simoncozens/youseedee"; + license = licenses.mit; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 70e2406ffa41a..d8be54666a0d3 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , mock -, zope_testing +, zope-testing , lib }: @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ mock ]; - propagatedBuildInputs = [ zope_testing ]; + propagatedBuildInputs = [ zope-testing ]; meta = with lib; { description = "Inter-process locks"; diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 522b2817a8455..44f01efa8d2e6 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_configuration +, zope-configuration , zope-deferredimport , zope-deprecation , zope_event @@ -22,7 +22,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - zope_configuration + zope-configuration zope-deferredimport zope-deprecation zope_event diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix new file mode 100644 index 0000000000000..e5a30f1e7d68b --- /dev/null +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, zope-i18nmessageid +, zope_interface +, zope_schema +, pytestCheckHook +, zope-testing +, zope_testrunner +, manuel +}: + +buildPythonPackage rec { + pname = "zope-configuration"; + version = "5.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "zope.configuration"; + inherit version; + hash = "sha256-I0tKGMcfazub9rzyJSZLrgFJrGjeoHsHLw9pmkzsJuc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + manuel + pytestCheckHook + zope-testing + zope_testrunner + ]; + + propagatedBuildInputs = [ + zope-i18nmessageid + zope_interface + zope_schema + ]; + + # Need to investigate how to run the tests with zope-testrunner + doCheck = false; + + pythonImportsCheck = [ + "zope.configuration" + ]; + + pythonNamespaces = [ + "zope" + ]; + + meta = with lib; { + description = "Zope Configuration Markup Language (ZCML)"; + homepage = "https://github.com/zopefoundation/zope.configuration"; + changelog = "https://github.com/zopefoundation/zope.configuration/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 64db918321d10..a1cd30fd54785 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_testing +, zope-testing }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { hash = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw="; }; - nativeCheckInputs = [ zope_testing ]; + nativeCheckInputs = [ zope-testing ]; meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index 15b3f74a43945..290066f3e1579 100644 --- a/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -12,7 +12,7 @@ , wsgiproxy2 , six , mock -, zope_testing +, zope-testing , zope_testrunner , python }: @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - zope_testing + zope-testing zope_testrunner ]; diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix new file mode 100644 index 0000000000000..65672118e4ef9 --- /dev/null +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zope-testing"; + version = "5.0.1"; + pyproject = true; + + src = fetchPypi { + pname = "zope.testing"; + inherit version; + hash = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + doCheck = !isPyPy; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/zope/testing/tests.py" + ]; + + pythonImportsCheck = [ + "zope.testing" + ]; + + pythonNamespaces = [ + "zope" + ]; + + meta = with lib; { + description = "Zope testing helpers"; + homepage = "https://github.com/zopefoundation/zope.testing"; + changelog = "https://github.com/zopefoundation/zope.testing/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix deleted file mode 100644 index b6cc1c0f9998b..0000000000000 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zope-i18nmessageid -, zope_schema -, zope_testrunner -, manuel -}: - -buildPythonPackage rec { - pname = "zope.configuration"; - version = "4.4.1"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; - }; - - nativeCheckInputs = [ zope_testrunner manuel ]; - - propagatedBuildInputs = [ zope-i18nmessageid zope_schema ]; - - # Need to investigate how to run the tests with zope-testrunner - doCheck = false; - - meta = with lib; { - description = "Zope Configuration Markup Language (ZCML)"; - homepage = "https://github.com/zopefoundation/zope.configuration"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index b3694fe09dc99..329ab7455c5cf 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -4,7 +4,7 @@ , zope_location , zope_event , zope_interface -, zope_testing +, zope-testing }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-6tTbywM1TU5BDJo7kERR60TZAlR1Gxy97fSmGu3p+7k="; }; - propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; + propagatedBuildInputs = [ zope_location zope_event zope_interface zope-testing ]; # ImportError: No module named 'zope.event' # even though zope_event has been included. diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix deleted file mode 100644 index bc5d9ed94b2e7..0000000000000 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPyPy -, zope_interface -, zope_exceptions -, zope_location -}: - -buildPythonPackage rec { - pname = "zope.testing"; - version = "5.0.1"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; - }; - - doCheck = !isPyPy; - - propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; - - meta = with lib; { - description = "Zope testing helpers"; - homepage = "http://pypi.python.org/pypi/zope.testing"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index d687e24082f41..2307494fcbde6 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -3,7 +3,7 @@ , fetchPypi , zope_interface , zope_exceptions -, zope_testing +, zope-testing , six }: @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q="; }; - propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; + propagatedBuildInputs = [ zope_interface zope_exceptions zope-testing six ]; doCheck = false; # custom test modifies sys.path diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix index fe889522e5f75..81b068e232124 100644 --- a/pkgs/development/python-modules/zulip/default.nix +++ b/pkgs/development/python-modules/zulip/default.nix @@ -2,38 +2,46 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , requests , matrix-client , distro , click , typing-extensions +, matrix-nio , pytestCheckHook }: buildPythonPackage rec { pname = "zulip"; - version = "0.8.2"; + version = "0.9.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; + + pyproject = true; # no sdist on PyPI src = fetchFromGitHub { owner = "zulip"; repo = "python-zulip-api"; rev = version; - hash = "sha256-Z5WrV/RDQwdKUBF86M5/xWhXn3fGNqJtqO5PTd7s5ME="; + hash = "sha256-YnNXduZ2KOjRHGwhojkqpMP2mwhflk8/f4FVZL8NvHU="; }; sourceRoot = "${src.name}/zulip"; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests - matrix-client distro click typing-extensions - ]; + ] ++ requests.optional-dependencies.security; nativeCheckInputs = [ + matrix-nio pytestCheckHook ]; diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix index d5ece13451c5b..b75a03b65a787 100644 --- a/pkgs/development/skaware-packages/s6-dns/default.nix +++ b/pkgs/development/skaware-packages/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.6.0"; - sha256 = "AefHUyzF56a4kVRhsBwvcGt/IhF4KSPiXqpU7gxtx8c="; + version = "2.3.7.0"; + sha256 = "rusndssjTpA5enjGqjclkkqgcQwQNcpw3VYouExnAdE="; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/development/skaware-packages/s6-man-pages/default.nix b/pkgs/development/skaware-packages/s6-man-pages/default.nix index 417d2d368cd61..c21da0e17ae24 100644 --- a/pkgs/development/skaware-packages/s6-man-pages/default.nix +++ b/pkgs/development/skaware-packages/s6-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-man-pages"; - version = "2.11.3.2.4"; - sha256 = "02dmccmcwssv8bkzs3dlbnwl6kkp1crlbnlv5ljbrgm26klw9rc7"; + version = "2.12.0.2.1"; + sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ="; description = "Port of the documentation for the s6 supervision suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix index 9cddabb58591a..8c3e753fc2aaa 100644 --- a/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/pkgs/development/skaware-packages/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.6.0.0"; - sha256 = "MdHWj7BdY5zr6VFLui9npU5YAfJsDRYvh1XNSxYuGLA="; + version = "2.7.0.0"; + sha256 = "mf1uP5PW1qlb9+l4lVt9BTYpWReUsGjtogBKuLSQVVI="; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix index 8a1b3aa87a6a0..e879bf6204d64 100644 --- a/pkgs/development/skaware-packages/s6/default.nix +++ b/pkgs/development/skaware-packages/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.12.0.0"; - sha256 = "sha256-mBjDqeIYGSQGJw9B00K+23oZ8Z3gBbqzxitACTAz72w="; + version = "2.12.0.2"; + sha256 = "qpF+/+Eq6XN5CQ91/aSfDV8PZ81lVDaEz/BtyIFyj4w="; description = "skarnet.org's small & secure supervision software suite"; diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index 80db4b6248269..a9af0cac6562d 100644 --- a/pkgs/development/skaware-packages/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix @@ -8,8 +8,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.14.0.0"; - sha256 = "p0X9NM+EvsdDmO/6G29MOcVXNnM5ObEmA45SstXcwdI="; + version = "2.14.0.1"; + sha256 = "tD69s2+KjfQPGgjBOwg5O85J+vM05ioNuRmzrkr9FIg="; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix index 6b44516615a07..85a8440ef1ede 100644 --- a/pkgs/development/skaware-packages/tipidee/default.nix +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "tipidee"; - version = "0.0.1.0"; - sha256 = "sha256-rKi9IX9CcRhY4n44i2vDom9MIeuGxRAHF7u0C3nNvFU="; + version = "0.0.2.0"; + sha256 = "5I+/gfvN8s4bf6Oi+5kzRndWeLV7movyRfznz0kNMoY="; description = "A HTTP 1.1 webserver, serving static files and CGI/NPH"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3ab4e48320f07..f7bbe7a4650b5 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.19"; + version = "3.1.20"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-/rjPFGfVKYR/N4BGjw+T25ZihfEuTMXdE/6fCKizCfQ="; + hash = "sha256-begNKHGFTxlDIG3+PNG+/zCw59dU8gvJcjrVsfaPPaE="; }; patches = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 6ed8c18d0b1a3..3b6b24f327d3c 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.222.0"; + version = "0.223.2"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-IOy6zsDGUfiSeOalQnku/4uNyjqpz2bMcpmf7Vq9fyI="; + hash = "sha256-vjsqQuQxTywSx4c0lnDKrrNr5hfFog9UurhIctq14f4="; }; postPatch = '' @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { makeFlags = [ "FLOW_RELEASE=1" ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + installPhase = '' install -Dm755 bin/flow $out/bin/flow install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index ff24e7b7c1cdf..96a6d28e97877 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,23 +1,55 @@ -{ lib, stdenv, cmake, zlib, fetchFromGitHub }: +{ lib, stdenv, cmake, zlib, fetchFromGitHub, re2, abseil-cpp, protobuf, capstone, gtest, pkg-config, lit, llvmPackages_16 }: stdenv.mkDerivation rec { - version = "1.1"; pname = "bloaty"; + version = "1.1-unstable-2023-11-06"; src = fetchFromGitHub { owner = "google"; repo = "bloaty"; - rev = "v${version}"; - sha256 = "1556gb8gb8jwf5mwxppcqz3mp269b5jhd51kj341iqkbn27zzngk"; - fetchSubmodules = true; + rev = "16f9fe54d9cd0e9abe1d25fc1a9b44c214cfaa9f"; + hash = "sha256-mIVlNMKtJMfH2QdYZ6+oV7619oYzvKkq3fHY6uofqlM="; }; - nativeBuildInputs = [ cmake ]; + # Old vendored package which has no other use than here, so not packaged in nixpkgs. + demumble = fetchFromGitHub { + owner = "nico"; + repo = "demumble"; + rev = "01098eab821b33bd31b9778aea38565cd796aa85"; + hash = "sha256-605SsXd7TSdm3BH854ChHIZbOXcHI/n8RN+pFMz4Ex4="; + }; + + cmakeFlags = [ + "-DLIT_EXECUTABLE=${lit}/bin/lit" + "-DFILECHECK_EXECUTABLE=${llvmPackages_16.libllvm}/bin/FileCheck" + "-DYAML2OBJ_EXECUTABLE=${llvmPackages_16.libllvm}/bin/yaml2obj" + ]; + + postPatch = '' + # Build system relies on some of those source files + rm -rf third_party/googletest third_party/abseil-cpp third_party/demumble + ln -s ${gtest.src} third_party/googletest + ln -s ${abseil-cpp.src} third_party/abseil-cpp + ln -s ${demumble} third_party/demumble + substituteInPlace CMakeLists.txt \ + --replace "find_package(Python COMPONENTS Interpreter)" "" \ + --replace "if(Python_FOUND AND LIT_EXECUTABLE" "if(LIT_EXECUTABLE" \ + --replace "COMMAND \''\${Python_EXECUTABLE} \''\${LIT_EXECUTABLE}" "COMMAND \''\${LIT_EXECUTABLE}" + # wasm test fail. Possibly due to LLVM version < 17. See https://github.com/google/bloaty/pull/354 + rm -rf tests/wasm + ''; + + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib re2 abseil-cpp protobuf capstone gtest lit llvmPackages_16.libllvm ]; doCheck = true; + postCheck = '' + # These lit tests need to be build seperatly. + # See https://github.com/google/bloaty/blob/main/tests/README.md + cmake --build . --target check-bloaty + ''; installPhase = '' install -Dm755 {.,$out/bin}/bloaty ''; diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index b6bce326a37d4..505f22c225bc1 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-4psd9dHqYDqexUYkib057YUEwSQssBz6HF5vv2NV2Fo="; + hash = "sha256-eE3RNLK5xKOjXeA+vDQmM1hvw92TbmPEDLdeqimgwcA="; }; cargoRoot = "generator"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-dpLENGY6PFV7WheVcEjuWPLLCMy+voSSCMOs9P9Jjpw="; + hash = "sha256-j9tsRho/gWCGwXUYZSbs3rudT6nYHh0FSfBCAemZHmw="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 41843024a5150..8898ff89f3716 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-ph44J90g5zOTi/+FVbdnDDJp1gXcxPt7coA1rvhsQSQ="; + hash = "sha256-nQvrd2W9xWWGTlwN5Q2E3rs67OUxZ4bIp+rK2W2PUww="; }; vendorHash = null; diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta.lock b/pkgs/development/tools/cocoapods/Gemfile-beta.lock index ec60a9ec8a058..0914cda26b4ff 100644 --- a/pkgs/development/tools/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/tools/cocoapods/Gemfile-beta.lock @@ -3,10 +3,15 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.8) + activesupport (7.1.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) @@ -14,13 +19,15 @@ GEM httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) + base64 (0.2.0) + bigdecimal (3.1.4) claide (1.1.0) - cocoapods (1.13.0) + cocoapods (1.14.3) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.13.0) + cocoapods-core (= 1.14.3) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -33,7 +40,7 @@ GEM nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.13.0) + cocoapods-core (1.14.3) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -44,7 +51,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -54,10 +61,13 @@ GEM cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.2.2) + connection_pool (2.4.1) + drb (2.2.0) + ruby2_keywords escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.15.5) + ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -67,13 +77,15 @@ GEM json (2.6.3) minitest (5.20.0) molinillo (0.8.0) + mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.7) rexml (3.2.6) ruby-macho (2.5.1) - typhoeus (1.4.0) + ruby2_keywords (0.0.5) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -92,4 +104,4 @@ DEPENDENCIES cocoapods (>= 1.7.0.beta.1) BUNDLED WITH - 2.3.20 + 2.4.20 diff --git a/pkgs/development/tools/cocoapods/Gemfile.lock b/pkgs/development/tools/cocoapods/Gemfile.lock index 60028105ba775..a8ba0fcb84997 100644 --- a/pkgs/development/tools/cocoapods/Gemfile.lock +++ b/pkgs/development/tools/cocoapods/Gemfile.lock @@ -3,10 +3,15 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.8) + activesupport (7.1.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) @@ -14,13 +19,15 @@ GEM httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) + base64 (0.2.0) + bigdecimal (3.1.4) claide (1.1.0) - cocoapods (1.13.0) + cocoapods (1.14.3) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.13.0) + cocoapods-core (= 1.14.3) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -33,7 +40,7 @@ GEM nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.13.0) + cocoapods-core (1.14.3) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -44,7 +51,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -54,10 +61,13 @@ GEM cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.2.2) + connection_pool (2.4.1) + drb (2.2.0) + ruby2_keywords escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.15.5) + ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -67,13 +77,15 @@ GEM json (2.6.3) minitest (5.20.0) molinillo (0.8.0) + mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.7) rexml (3.2.6) ruby-macho (2.5.1) - typhoeus (1.4.0) + ruby2_keywords (0.0.5) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -92,4 +104,4 @@ DEPENDENCIES cocoapods BUNDLED WITH - 2.3.20 + 2.4.20 diff --git a/pkgs/development/tools/cocoapods/gemset-beta.nix b/pkgs/development/tools/cocoapods/gemset-beta.nix index ddf14e02e7a2e..46dd5efae9325 100644 --- a/pkgs/development/tools/cocoapods/gemset-beta.nix +++ b/pkgs/development/tools/cocoapods/gemset-beta.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; + sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v"; type = "gem"; }; - version = "7.0.8"; + version = "7.1.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -42,6 +42,26 @@ }; version = "0.1.3"; }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; + type = "gem"; + }; + version = "3.1.4"; + }; CFPropertyList = { dependencies = ["rexml"]; groups = ["default"]; @@ -69,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mwcdg1i4126jf2qcsp4mhd1vqzqd8ck08wpyassz1sg0a8yxw4j"; + sha256 = "1r2w719d5zfzl3wnc5npnjv4194b7gdh4vib09vifdm8yab14br3"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.3"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -80,10 +100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g944vch2mllh8lijbfgl0c2kn9gi5vsg9y9v67x0qca5b1bx4id"; + sha256 = "04qyzcwkwbm7l4kjp6m8g2pvsryfvsllwpqf0mxfnzwbdid40zwn"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.3"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -100,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jgipkiah3z6qb9ax6qac3b2m1idavd5adc319k5rjsfddpfgszh"; + sha256 = "1ldnwwsx44i2xsdmsmyz9xrar19lfy5s5xslvral1p3674dvwvmv"; type = "gem"; }; - version = "1.6.3"; + version = "2.1"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -167,6 +187,27 @@ }; version = "1.2.2"; }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; + }; + drb = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + type = "gem"; + }; + version = "2.2.0"; + }; escape = { groups = ["default"]; platforms = []; @@ -193,10 +234,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; fourflusher = { groups = ["default"]; @@ -279,6 +320,16 @@ }; version = "0.8.0"; }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; + }; nanaimo = { groups = ["default"]; platforms = []; @@ -339,16 +390,26 @@ }; version = "2.5.1"; }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; typhoeus = { dependencies = ["ethon"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; + sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; diff --git a/pkgs/development/tools/cocoapods/gemset.nix b/pkgs/development/tools/cocoapods/gemset.nix index c0e5c50fa5033..f1df94282b37c 100644 --- a/pkgs/development/tools/cocoapods/gemset.nix +++ b/pkgs/development/tools/cocoapods/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; + sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v"; type = "gem"; }; - version = "7.0.8"; + version = "7.1.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -40,6 +40,26 @@ }; version = "0.1.3"; }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; + type = "gem"; + }; + version = "3.1.4"; + }; CFPropertyList = { dependencies = ["rexml"]; groups = ["default"]; @@ -67,10 +87,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mwcdg1i4126jf2qcsp4mhd1vqzqd8ck08wpyassz1sg0a8yxw4j"; + sha256 = "1r2w719d5zfzl3wnc5npnjv4194b7gdh4vib09vifdm8yab14br3"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.3"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -78,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g944vch2mllh8lijbfgl0c2kn9gi5vsg9y9v67x0qca5b1bx4id"; + sha256 = "04qyzcwkwbm7l4kjp6m8g2pvsryfvsllwpqf0mxfnzwbdid40zwn"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.3"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -98,10 +118,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jgipkiah3z6qb9ax6qac3b2m1idavd5adc319k5rjsfddpfgszh"; + sha256 = "1ldnwwsx44i2xsdmsmyz9xrar19lfy5s5xslvral1p3674dvwvmv"; type = "gem"; }; - version = "1.6.3"; + version = "2.1"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -161,6 +181,27 @@ }; version = "1.2.2"; }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; + }; + drb = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + type = "gem"; + }; + version = "2.2.0"; + }; escape = { source = { remotes = ["https://rubygems.org"]; @@ -185,10 +226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; fourflusher = { groups = ["default"]; @@ -267,6 +308,16 @@ }; version = "0.8.0"; }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; + }; nanaimo = { groups = ["default"]; platforms = []; @@ -323,16 +374,26 @@ }; version = "2.5.1"; }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; typhoeus = { dependencies = ["ethon"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; + sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock index 11d066eaea1b4..56928d9368e93 100644 --- a/pkgs/development/tools/cucumber/Gemfile.lock +++ b/pkgs/development/tools/cucumber/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: https://rubygems.org/ specs: builder (3.2.4) - cucumber (9.0.2) + cucumber (9.1.0) builder (~> 3.2, >= 3.2.4) cucumber-ci-environment (~> 9.2, >= 9.2.0) - cucumber-core (~> 11.1, >= 11.1.0) - cucumber-cucumber-expressions (~> 16.1, >= 16.1.2) - cucumber-gherkin (>= 24, < 26.2.1) + cucumber-core (~> 12.0) + cucumber-cucumber-expressions (~> 17.0) + cucumber-gherkin (>= 24, < 27) cucumber-html-formatter (~> 20.4, >= 20.4.0) cucumber-messages (>= 19, < 23) diff-lcs (~> 1.5, >= 1.5.0) @@ -15,17 +15,17 @@ GEM multi_test (~> 1.1, >= 1.1.0) sys-uname (~> 1.2, >= 1.2.3) cucumber-ci-environment (9.2.0) - cucumber-core (11.1.0) - cucumber-gherkin (>= 24, < 27) - cucumber-messages (>= 19, < 22) - cucumber-tag-expressions (~> 4.1, >= 4.1.0) - cucumber-cucumber-expressions (16.1.2) + cucumber-core (12.0.0) + cucumber-gherkin (>= 25, < 27) + cucumber-messages (>= 20, < 23) + cucumber-tag-expressions (~> 5.0, >= 5.0.4) + cucumber-cucumber-expressions (17.0.1) cucumber-gherkin (26.2.0) cucumber-messages (>= 19.1.4, < 22.1) cucumber-html-formatter (20.4.0) cucumber-messages (>= 18.0, < 22.1) - cucumber-messages (21.0.1) - cucumber-tag-expressions (4.1.0) + cucumber-messages (22.0.0) + cucumber-tag-expressions (5.0.6) diff-lcs (1.5.0) ffi (1.16.3) mini_mime (1.1.5) @@ -40,4 +40,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 2.4.20 + 2.4.22 diff --git a/pkgs/development/tools/cucumber/gemset.nix b/pkgs/development/tools/cucumber/gemset.nix index 16d750887a3e2..1f8f35f1098c0 100644 --- a/pkgs/development/tools/cucumber/gemset.nix +++ b/pkgs/development/tools/cucumber/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hwbq5sn4hsd922j1p3a4p2404306yczgx2vqggvr20q01fzx55h"; + sha256 = "0gmbbj4s4cv9aifks29q9w9yjcrvihcz1i8sijplwbps7334skv1"; type = "gem"; }; - version = "9.0.2"; + version = "9.1.0"; }; cucumber-ci-environment = { groups = ["default"]; @@ -36,20 +36,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02mrykswrxziy08fc9fjvg3l2aa6jfji2012wzh7pyamhm8pcnjb"; + sha256 = "1ylxpganbvlzcd4picmgbs060cf0nlpkjc7lqxndyr6xaz2g99y2"; type = "gem"; }; - version = "11.1.0"; + version = "12.0.0"; }; cucumber-cucumber-expressions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8bazf8bwlm0zar2316p4xxmpy44wyjnw2z6bj7zc5nl8nmyvym"; + sha256 = "0xyvg7l2y9b9gh682z47zcf1na179n8j7bwfyahp79w8s047660b"; type = "gem"; }; - version = "16.1.2"; + version = "17.0.1"; }; cucumber-gherkin = { dependencies = ["cucumber-messages"]; @@ -78,20 +78,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0482a63y7my0arn2bv208g401dq8525f0gwhnwaa11mhv6ph0q5i"; + sha256 = "06d7dnixz68ivngf6qflmi6xrjshjyi85gmyjrl07pbmhqi6r2nh"; type = "gem"; }; - version = "21.0.1"; + version = "22.0.0"; }; cucumber-tag-expressions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v1ssg4chkahck1ddl2j1hcifm0vlcn9sb104ywshw5gyv59s9qd"; + sha256 = "0rmbw044fdy2756ypnqray8abfxqvwrn1jhsdafdbjwihvvsk62f"; type = "gem"; }; - version = "4.1.0"; + version = "5.0.6"; }; diff-lcs = { groups = ["default"]; diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/development/tools/database/litefs/default.nix index c12cde6af9185..4c941a7609aa7 100644 --- a/pkgs/development/tools/database/litefs/default.nix +++ b/pkgs/development/tools/database/litefs/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "litefs"; - version = "0.5.4"; + version = "0.5.8"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gTXIQVnNyVn2UqigozvEPaPm3XoqHd6E0RZnZS4bP3g="; + sha256 = "sha256-oF69bmWI4I/ok89Rgve4eedMR9MCcaxmQ4bGff831dI="; }; - vendorHash = "sha256-4e1tAAXM2EYuqe1AbN1wng/bq1BP7MSOV6woeKjc3x4="; + vendorHash = "sha256-6Dg1fU4y0eUeiX9uUwJ2IUxBr81vWR6eUuCV+iPBNBk="; subPackages = [ "cmd/litefs" ]; diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock index 5f4df8b9a2f98..573e31eababdb 100644 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -321,11 +321,12 @@ version = "0.1.0" dependencies = [ "anyhow", "enumflags2", - "indoc", + "indoc 2.0.3", "insta", "query-engine-metrics", "query-engine-tests", "query-tests-setup", + "regex", "reqwest", "serde_json", "tokio", @@ -433,7 +434,7 @@ dependencies = [ "connection-string", "either", "enumflags2", - "indoc", + "indoc 2.0.3", "lsp-types", "once_cell", "psl-core", @@ -673,6 +674,16 @@ dependencies = [ ] [[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -860,29 +871,26 @@ dependencies = [ [[package]] name = "cuid" version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51294db11d38eb763c92936c5c88425d0090e27dce21dd15748134af9e53e739" +source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#81309f9a11f70d178bb545971d51ceb7da692c52" dependencies = [ "base36", "cuid-util", "cuid2", - "hostname", "num", "once_cell", "rand 0.8.5", + "sha3", ] [[package]] name = "cuid-util" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea2bfe0336ff1b7ca74819b2df8dfae9afea358aff6b1688baa5c181d8c3713" +source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#81309f9a11f70d178bb545971d51ceb7da692c52" [[package]] name = "cuid2" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d99cacd52fd67db7490ad051c8c1973fb75520174d69aabbae08c534c9d0e8" +source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#81309f9a11f70d178bb545971d51ceb7da692c52" dependencies = [ "cuid-util", "num", @@ -892,12 +900,36 @@ dependencies = [ [[package]] name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core 0.10.2", + "darling_macro 0.10.2", +] + +[[package]] +name = "darling" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.9.3", + "syn 1.0.109", ] [[package]] @@ -916,11 +948,22 @@ dependencies = [ [[package]] name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core 0.10.2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core", + "darling_core 0.13.4", "quote", "syn 1.0.109", ] @@ -950,7 +993,7 @@ version = "0.1.0" dependencies = [ "base64 0.13.1", "expect-test", - "indoc", + "indoc 2.0.3", "once_cell", "psl", "regex", @@ -991,7 +1034,7 @@ name = "diagnostics" version = "0.1.0" dependencies = [ "colored", - "indoc", + "indoc 2.0.3", "pest", ] @@ -1036,7 +1079,7 @@ dependencies = [ "expect-test", "flate2", "indexmap 1.9.3", - "indoc", + "indoc 2.0.3", "itertools", "pretty_assertions", "prisma-models", @@ -1378,6 +1421,12 @@ dependencies = [ ] [[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1506,8 +1555,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1523,6 +1574,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] +name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] name = "graphql-parser" version = "0.3.0" source = "git+https://github.com/prisma/graphql-parser#6a3f58bd879065588e710cb02b5bd30c1ce182c3" @@ -1824,11 +1888,34 @@ dependencies = [ [[package]] name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc" version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" [[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", + "unindent", +] + +[[package]] name = "insta" version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2310,9 +2397,9 @@ dependencies = [ [[package]] name = "mobc" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bdeff49b387edef305eccfe166af3e1483bb57902dbf369dddc42dc824df23b" +checksum = "90eb49dc5d193287ff80e72a86f34cfb27aae562299d22fea215e06ea1059dd3" dependencies = [ "async-trait", "futures-channel", @@ -2426,11 +2513,11 @@ dependencies = [ "enumflags2", "expect-test", "futures", - "indoc", + "indoc 2.0.3", "mongodb", "mongodb-client", "mongodb-schema-describer", - "names", + "names 0.12.0", "once_cell", "psl", "regex", @@ -2529,6 +2616,15 @@ dependencies = [ [[package]] name = "names" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da" +dependencies = [ + "rand 0.3.23", +] + +[[package]] +name = "names" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" @@ -2973,6 +3069,12 @@ dependencies = [ ] [[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] name = "pbkdf2" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3234,7 +3336,7 @@ dependencies = [ "dmmf", "enumflags2", "expect-test", - "indoc", + "indoc 2.0.3", "log", "lsp-types", "once_cell", @@ -3251,6 +3353,7 @@ dependencies = [ "bigdecimal", "chrono", "cuid", + "getrandom 0.2.10", "itertools", "nanoid", "prisma-value", @@ -3316,6 +3419,12 @@ dependencies = [ ] [[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] name = "proc-macro2" version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3386,7 +3495,7 @@ dependencies = [ "dissimilar", "either", "expect-test", - "indoc", + "indoc 2.0.3", "psl-core", ] @@ -3398,7 +3507,7 @@ dependencies = [ "chrono", "diagnostics", "enumflags2", - "indoc", + "indoc 2.0.3", "itertools", "lsp-types", "once_cell", @@ -3463,16 +3572,23 @@ dependencies = [ "either", "futures", "hex", + "indoc 0.3.6", "lru-cache", "metrics 0.18.1", "mobc", "mysql_async", + "names 0.11.0", "native-tls", "num_cpus", + "once_cell", + "paste", "percent-encoding", "postgres-native-tls", "postgres-types", + "quaint-test-macros", + "quaint-test-setup", "rusqlite", + "serde", "serde_json", "sqlformat", "thiserror", @@ -3487,6 +3603,30 @@ dependencies = [ ] [[package]] +name = "quaint-test-macros" +version = "0.1.0" +dependencies = [ + "darling 0.10.2", + "once_cell", + "proc-macro2", + "quaint-test-setup", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quaint-test-setup" +version = "0.1.0" +dependencies = [ + "async-trait", + "bitflags 1.3.2", + "names 0.11.0", + "once_cell", + "quaint", + "tokio", +] + +[[package]] name = "quanta" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3567,7 +3707,7 @@ dependencies = [ "enumflags2", "graphql-parser", "hyper", - "indoc", + "indoc 2.0.3", "mongodb-query-connector", "opentelemetry", "opentelemetry-otlp", @@ -3652,7 +3792,7 @@ dependencies = [ "colored", "enumflags2", "futures", - "indoc", + "indoc 2.0.3", "insta", "once_cell", "prisma-value", @@ -3669,10 +3809,39 @@ dependencies = [ ] [[package]] +name = "query-engine-wasm" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "connection-string", + "console_error_panic_hook", + "futures", + "js-sys", + "log", + "prisma-models", + "psl", + "serde", + "serde-wasm-bindgen", + "serde_json", + "thiserror", + "tokio", + "tracing", + "tracing-futures", + "tracing-subscriber", + "tsify", + "url", + "user-facing-errors", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-logger", +] + +[[package]] name = "query-test-macros" version = "0.1.0" dependencies = [ - "darling", + "darling 0.13.4", "proc-macro2", "quote", "syn 1.0.109", @@ -3687,7 +3856,7 @@ dependencies = [ "enumflags2", "hyper", "indexmap 1.9.3", - "indoc", + "indoc 2.0.3", "itertools", "jsonrpc-core", "nom", @@ -3748,6 +3917,29 @@ dependencies = [ [[package]] name = "rand" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" +dependencies = [ + "libc", + "rand 0.4.6", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi", +] + +[[package]] +name = "rand" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" @@ -3792,6 +3984,21 @@ dependencies = [ [[package]] name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" @@ -3849,6 +4056,15 @@ dependencies = [ ] [[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4266,7 +4482,7 @@ dependencies = [ "base64 0.13.1", "connection-string", "expect-test", - "indoc", + "indoc 2.0.3", "jsonrpc-core", "quaint", "schema-connector", @@ -4371,6 +4587,17 @@ dependencies = [ ] [[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] name = "serde_bytes" version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4391,6 +4618,17 @@ dependencies = [ ] [[package]] +name = "serde_derive_internals" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] name = "serde_json" version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4441,7 +4679,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "darling", + "darling 0.13.4", "proc-macro2", "quote", "syn 1.0.109", @@ -4624,7 +4862,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" name = "sql-ddl" version = "0.1.0" dependencies = [ - "indoc", + "indoc 2.0.3", ] [[package]] @@ -4635,7 +4873,7 @@ dependencies = [ "connection-string", "enumflags2", "expect-test", - "indoc", + "indoc 2.0.3", "pretty_assertions", "psl", "quaint", @@ -4661,7 +4899,7 @@ dependencies = [ "connection-string", "enumflags2", "expect-test", - "indoc", + "indoc 2.0.3", "jsonrpc-core", "once_cell", "pretty_assertions", @@ -4722,7 +4960,7 @@ dependencies = [ "datamodel-renderer", "either", "enumflags2", - "indoc", + "indoc 2.0.3", "once_cell", "prisma-value", "psl", @@ -4753,7 +4991,7 @@ dependencies = [ "enumflags2", "expect-test", "indexmap 1.9.3", - "indoc", + "indoc 2.0.3", "once_cell", "pretty_assertions", "prisma-value", @@ -4822,6 +5060,12 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" @@ -5495,13 +5739,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] +name = "tsify" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" +dependencies = [ + "gloo-utils", + "serde", + "serde_json", + "tsify-macros", + "wasm-bindgen", +] + +[[package]] +name = "tsify-macros" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a94b0f0954b3e59bfc2c246b4c8574390d94a4ad4ad246aaf2fb07d7dfd3b47" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.28", +] + +[[package]] name = "twox-hash" version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -5574,6 +5843,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] name = "unreachable" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5614,7 +5889,7 @@ name = "user-facing-errors" version = "0.1.0" dependencies = [ "backtrace", - "indoc", + "indoc 2.0.3", "itertools", "quaint", "serde", diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index a180878f9a1c7..4d2dc36631845 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.4.1"; + version = "5.6.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-KYPDocC6S6YhJeneyI++UmmpuAYDoX6okqgOtGetilw="; + sha256 = "sha256-zyF2NAOPNJe23tIuOHalsvnYytALKZq8QY1L8EWJMno="; }; # Use system openssl. @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8="; + "cuid-1.3.2" = "sha256-ZihFrLerEIOdbJggaBbByRbC1sZRvF4M0LN2albB7vA="; "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ="; "postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw="; diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index cc68d8b93bbe8..324270ee7c239 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; - version = "23.2.0.178.1027"; + version = "23.3.0.270.1251"; src = fetchurl { url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y="; + hash = "sha256-TkQkMtCTKUdfVx9sfAJVJP4nAaQmG4SDcduwaFfAEGs="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/fastgron/default.nix b/pkgs/development/tools/fastgron/default.nix index d4ac30958a273..77c09fef99f3d 100644 --- a/pkgs/development/tools/fastgron/default.nix +++ b/pkgs/development/tools/fastgron/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastgron"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "adamritter"; repo = "fastgron"; rev = "v${finalAttrs.version}"; - hash = "sha256-sGTJ98YEvy+pOFVLLIcvgUq5Pn4r1CYL9YEchZhoBeQ="; + hash = "sha256-IBs6oC+dbssAkUGk84vXteSlO6j88LZlmlmcV77M2YM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index fdd669cf90abc..b807457ad01e0 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -78,9 +78,9 @@ (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.24"; sha256 = "0lriw4f48f0q2vyagbngnffshdismn3msn7d6dj0lb2xdkzsz1f1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.24"; sha256 = "08670zhn2ywkwy0d7sj89rikxccy5qg0vsjwpbypvzndawng0bb9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.24"; sha256 = "0knx6lhlqxn3lkgakpab0663788q0si00m9ga7wdn2mzqq0s9yx0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.25"; sha256 = "1vrmqn5j6ibwkqasbf7x7n4w5jdclnz3giymiwvym2wa0y5zc59q"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.25"; sha256 = "0mgcs4si7mwd0f555s1vg17pf4nqfaijd1pci359l1pgrmv70rrg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.25"; sha256 = "0wvzhqhlmlbnpa18qp8m3wcrlcgj3ckvp3iv2n7g8vb60c3238aq"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.0"; sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.2.0"; sha256 = "09hs74nr0kv83wc1way9x7vq3nmxbr2s4vdy99hx78kj25pylcr7"; }) @@ -121,11 +121,11 @@ (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.6.3"; sha256 = "0g5jdg0jp844a2ygwlm04igsxkrihqcq2rpmfx722nrv3vrk0r0z"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.24"; sha256 = "1vyy01i4w2wcx82mrjjsbp98v9sjn1cwhdvkhrw8yrrb04lcxbir"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.24"; sha256 = "02l6javfqwsaialkimmpsq3v4dhb1j4sxy19yvr5w5sdjmq1jh5y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.24"; sha256 = "1fy1hr14igy4lix4vmwkjj13cbyjjfhx8izch9cd9hc4f1y25767"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.24"; sha256 = "1zcn4px94z67j60cidynm5ab8cln1rrxabv7c24mlajqnkfw14sb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.24"; sha256 = "0rylvdvdc5rdmw2vcqi0fdzmiwwa1pwlqiavqnb2pslhhq8qg4mh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.25"; sha256 = "052388yjivzkfllkss0nljbzmjx787jqdjsbb6ls855sp6wh9xfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.25"; sha256 = "103xy6kncjwbbchfnpqvsjpjy92x3dralcg9pw939jp0dwggwarz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.25"; sha256 = "0jfhmfxpx1h4f3axgf60gc8d4cnlvbb853400kag6nk0875hr0x1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.25"; sha256 = "0jpcmva1l8z36r4phz055l7fz9s6z8pv8pqc4ia69mhhgvr0ks7y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.25"; sha256 = "012jml0bqxbspahf1j4bvvd91pz85hsbcyhq00gxczcazhxpkhz4"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "7.0.4"; sha256 = "0afmivk3m0hmwsiqnl87frzi7g57aiv5fwnjds0icl66djpb6zsm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) diff --git a/pkgs/development/tools/gdtoolkit/default.nix b/pkgs/development/tools/gdtoolkit/default.nix index 479b0b2c3636b..ea5e5ec8de9ae 100644 --- a/pkgs/development/tools/gdtoolkit/default.nix +++ b/pkgs/development/tools/gdtoolkit/default.nix @@ -1,23 +1,28 @@ { lib -, python3Packages +, python3 , fetchFromGitHub , godot3-server }: -let lark080 = python3Packages.lark.overrideAttrs (old: rec { - # gdtoolkit needs exactly this lark version - version = "0.8.0"; - src = fetchFromGitHub { - owner = "lark-parser"; - repo = "lark"; - rev = version; - hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs="; - fetchSubmodules = true; +let + python = python3.override { + packageOverrides = self: super: { + lark = super.lark.overridePythonAttrs (old: rec { + # gdtoolkit needs exactly this lark version + version = "0.8.0"; + src = fetchFromGitHub { + owner = "lark-parser"; + repo = "lark"; + rev = version; + hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs="; + fetchSubmodules = true; + }; + patches = [ ]; + }); + }; }; -}); - in -python3Packages.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "gdtoolkit"; version = "3.3.1"; @@ -29,18 +34,18 @@ python3Packages.buildPythonApplication rec { sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; }; - disabled = python3Packages.pythonOlder "3.7"; + disabled = python.pythonOlder "3.7"; - propagatedBuildInputs = [ lark080 - ] ++ (with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ docopt + lark pyyaml setuptools - ]); + ]; doCheck = true; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook hypothesis godot3-server diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/development/tools/gemstash/Gemfile.lock index b7f9f963f3b8f..eed8dffc62258 100644 --- a/pkgs/development/tools/gemstash/Gemfile.lock +++ b/pkgs/development/tools/gemstash/Gemfile.lock @@ -1,58 +1,100 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.6.2) + activesupport (7.1.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - concurrent-ruby (1.1.9) - dalli (2.7.11) - faraday (0.17.5) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.14.0) - faraday (>= 0.7.4, < 1.0) - gemstash (2.1.0) - activesupport (>= 4.2, < 6) - dalli (~> 2.7) - faraday (~> 0.9) - faraday_middleware (~> 0.10) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + base64 (0.2.0) + bigdecimal (3.1.4) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + dalli (3.2.6) + drb (2.2.0) + ruby2_keywords + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + gemstash (2.7.1) + activesupport (>= 4.2, < 8) + dalli (>= 3.2.3, < 4) + faraday (>= 1, < 3) + faraday_middleware (~> 1.0) lru_redux (~> 1.1) - puma (~> 4.0) + psych (>= 3.2.1) + puma (~> 6.1) sequel (~> 5.0) server_health_check-rack (~> 0.1) - sinatra (>= 1.4, < 3.0) + sinatra (>= 1.4, < 4.0) sqlite3 (~> 1.3) - thor (~> 0.20) - i18n (1.10.0) + terminal-table (~> 3.0) + thor (~> 1.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) lru_redux (1.1.0) - minitest (5.15.0) - multipart-post (2.1.1) - mustermann (1.1.1) + mini_portile2 (2.8.5) + minitest (5.20.0) + multipart-post (2.3.0) + mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - nio4r (2.5.8) - puma (4.3.11) + mutex_m (0.2.0) + nio4r (2.6.1) + psych (5.1.1.1) + stringio + puma (6.4.0) nio4r (~> 2.0) - rack (2.2.3) - rack-protection (2.2.0) - rack + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) ruby2_keywords (0.0.5) - sequel (5.54.0) + sequel (5.74.0) + bigdecimal server_health_check (1.0.2) server_health_check-rack (0.1.0) server_health_check (~> 1.0, >= 1.0.1) - sinatra (2.2.0) - mustermann (~> 1.0) - rack (~> 2.2) - rack-protection (= 2.2.0) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) tilt (~> 2.0) - sqlite3 (1.4.2) - thor (0.20.3) - thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.9) - thread_safe (~> 0.1) + sqlite3 (1.6.9) + mini_portile2 (~> 2.8.0) + stringio (3.1.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.3.0) + tilt (2.3.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) PLATFORMS ruby @@ -61,4 +103,4 @@ DEPENDENCIES gemstash BUNDLED WITH - 2.1.4 + 2.4.22 diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/development/tools/gemstash/gemset.nix index fd5ddcd6537cb..ba5b0b9178e1e 100644 --- a/pkgs/development/tools/gemstash/gemset.nix +++ b/pkgs/development/tools/gemstash/gemset.nix @@ -1,92 +1,220 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; - gem_platform = "ruby"; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775"; + sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v"; type = "gem"; }; - target_platform = "ruby"; - version = "5.2.6.2"; + version = "7.1.2"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; + type = "gem"; + }; + version = "3.1.4"; }; concurrent-ruby = { - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - target_platform = "ruby"; - version = "1.1.9"; + version = "1.2.2"; + }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; }; dalli = { - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0br39scmr187w3ifl5gsddl2fhq6ahijgw6358plqjdzrizlg764"; + sha256 = "137xw0nl7ixxqyam6fjgmzl24i3rdml37whgnks8y35w92i95447"; type = "gem"; }; - target_platform = "ruby"; - version = "2.7.11"; + version = "3.2.6"; + }; + drb = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + type = "gem"; + }; + version = "2.2.0"; }; faraday = { + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; + type = "gem"; + }; + version = "1.10.3"; + }; + faraday-em_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-multipart = { dependencies = ["multipart-post"]; - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bs2lm0wd273kwq8nk1p8pk43n1wrizv4c1bdywkpcm9g2f5sp6p"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - target_platform = "ruby"; - version = "0.17.5"; + version = "1.0.4"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-retry = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; }; faraday_middleware = { dependencies = ["faraday"]; - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc"; + sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; type = "gem"; }; - target_platform = "ruby"; - version = "0.14.0"; + version = "1.2.0"; }; gemstash = { - dependencies = ["activesupport" "dalli" "faraday" "faraday_middleware" "lru_redux" "puma" "sequel" "server_health_check-rack" "sinatra" "sqlite3" "thor"]; - gem_platform = "ruby"; + dependencies = ["activesupport" "dalli" "faraday" "faraday_middleware" "lru_redux" "psych" "puma" "sequel" "server_health_check-rack" "sinatra" "sqlite3" "terminal-table" "thor"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fimbc5xnsxq1g2zb7kn4qf3rp4klx7fxbigg34gr9i9apq8qfrc"; + sha256 = "0sysgn3gxxdyqm08b9ldsbzmp3yhdwgala9dfv5yspw5nkksprpj"; type = "gem"; }; - target_platform = "ruby"; - version = "2.1.0"; + version = "2.7.1"; }; i18n = { dependencies = ["concurrent-ruby"]; - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - target_platform = "ruby"; - version = "1.10.0"; + version = "1.14.1"; }; lru_redux = { gem_platform = "ruby"; @@ -100,92 +228,109 @@ target_platform = "ruby"; version = "1.1.0"; }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + type = "gem"; + }; + version = "2.8.5"; + }; minitest = { - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - target_platform = "ruby"; - version = "5.15.0"; + version = "5.20.0"; }; multipart-post = { - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x"; type = "gem"; }; - target_platform = "ruby"; - version = "2.1.1"; + version = "2.3.0"; }; mustermann = { dependencies = ["ruby2_keywords"]; - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd"; type = "gem"; }; - target_platform = "ruby"; - version = "1.1.1"; + version = "3.0.0"; + }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; }; nio4r = { - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "1y99dfzlb3kgzh7pfk8km0p5zjiblxyh5rm8yal9h523vi5awji8"; type = "gem"; }; - target_platform = "ruby"; - version = "2.5.8"; + version = "2.6.1"; + }; + psych = { + dependencies = ["stringio"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wjzrkssjfjpynij5dpycyflhqbjvi1gc2j73xgq3b196s1d3c24"; + type = "gem"; + }; + version = "5.1.1.1"; }; puma = { dependencies = ["nio4r"]; - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xvkz9xrd1cqnlm0qac1iwwxzndx3cc17zrjncpa4lzjfwbxhsnm"; + sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; type = "gem"; }; - target_platform = "ruby"; - version = "4.3.11"; + version = "6.4.0"; }; rack = { - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - target_platform = "ruby"; - version = "2.2.3"; + version = "2.2.8"; }; rack-protection = { dependencies = ["rack"]; - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; + sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; type = "gem"; }; - target_platform = "ruby"; - version = "2.2.0"; + version = "3.1.0"; }; ruby2_keywords = { gem_platform = "ruby"; @@ -200,16 +345,15 @@ version = "0.0.5"; }; sequel = { - gem_platform = "ruby"; + dependencies = ["bigdecimal"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wzb16vyslr7bpy7g5k2m35yz90bpf12f3pzj5w6icf1vldnc3nf"; + sha256 = "0zj66n0m1la1anxjjdb8a35frzabym112rf9ssyxq42mq05ln4m2"; type = "gem"; }; - target_platform = "ruby"; - version = "5.54.0"; + version = "5.74.0"; }; server_health_check = { gem_platform = "ruby"; @@ -238,76 +382,86 @@ }; sinatra = { dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y"; + sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8"; type = "gem"; }; - target_platform = "ruby"; - version = "2.2.0"; + version = "3.1.0"; }; sqlite3 = { - gem_platform = "ruby"; + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + sha256 = "08irz5llz31im8pmkk5k0kw433jyyji1qa98xkdmpphncdjr38am"; type = "gem"; }; - target_platform = "ruby"; - version = "1.4.2"; + version = "1.6.9"; }; - thor = { - gem_platform = "ruby"; + stringio = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1"; type = "gem"; }; - target_platform = "ruby"; - version = "0.20.3"; + version = "3.1.0"; }; - thread_safe = { - gem_platform = "ruby"; + terminal-table = { + dependencies = ["unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - target_platform = "ruby"; - version = "0.3.6"; + version = "3.0.2"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + type = "gem"; + }; + version = "1.3.0"; }; tilt = { - gem_platform = "ruby"; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; type = "gem"; }; - target_platform = "ruby"; - version = "2.0.10"; + version = "2.3.0"; }; tzinfo = { - dependencies = ["thread_safe"]; - gem_platform = "ruby"; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - target_platform = "ruby"; - version = "1.2.9"; + version = "2.0.6"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + type = "gem"; + }; + version = "2.5.0"; }; } diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index f03d51273454a..77689b1e1f873 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.31.0"; + version = "3.32.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-KkswkTgdhDzPLfbAdyhbo9IyYqxG5se0pt9QVTNZclM="; + hash = "sha256-ngBYnPwZ+B5BB2avnR2J6+8mNxT9vxtI8f9agNtD8uw="; }; - vendorHash = "sha256-ha2vJDh1rduoFU4a1Ta1cNWegAGt2VCq8N1emUYUZ64="; + vendorHash = "sha256-mPQ7sSFLzvcWtNh3pFhHKpnu5gXK+wC5qbGMRLZFTBE="; doCheck = false; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index e99d4cb6a8441..79d11c17cb254 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -43,14 +43,14 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.1.3-stable"; - commitHash = "fc79201851a16215f9554884aa242ed957801b10"; + version = "4.2.0-stable"; + commitHash = "46dc277917a93cbf601bbcf0d27d00f6feeec0d5"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-z5JRPhdEO20AodS12MApgur0BMHGToUjo2r2eI77nNc="; + hash = "sha256-eon9GOmOafOcPjyBqnrAUXwVBUOnYFBQy8o5dnumDDs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index b2d80e1916dc0..af7bc42ca751e 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gojq"; - version = "0.12.13"; + version = "0.12.14"; src = fetchFromGitHub { owner = "itchyny"; repo = pname; rev = "v${version}"; - hash = "sha256-tlnj0CCsPZRQjIZCvNPjN0JD6oqRDvdWOCYR3tYMPUA="; + hash = "sha256-mgmgOi3nMPwmcofEAVIN9nTE2oXnNN89lqT+Vi+sjzY="; }; - vendorHash = "sha256-DVJZ35C+6SuhaaGDM3u+3fB1497qaW6oTByAUPVwhJI="; + vendorHash = "sha256-dv4k2dIFnlJrGDTDM4mXBOpr4MF7oxms0y02ml50YyY="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix new file mode 100644 index 0000000000000..ed1a6c1a23b7e --- /dev/null +++ b/pkgs/development/tools/goperf/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchgit +, writeShellScript +, unstableGitUpdater +, sd +}: + +buildGoModule rec { + pname = "goperf"; + version = "unstable-2023-11-08"; + + src = fetchgit { + url = "https://go.googlesource.com/perf"; + rev = "cb71e802ccb878a069712546879bf26489f0f300"; + hash = "sha256-1NvrelLsy9lrepttXXnggc0oycC6EgJgU80iXDu3IoI="; + }; + + vendorHash = "sha256-dJQHqIR6v0yYbxplytkdA98IHtdxnsvi9X6kIESCsB8="; + + passthru.updateScript = writeShellScript "update-goperf" '' + export UPDATE_NIX_ATTR_PATH=goperf + ${lib.escapeShellArgs (unstableGitUpdater { inherit (src) url; })} + set -x + oldhash="$(nix-instantiate . --eval --strict -A "goperf.go-modules.drvAttrs.outputHash" | cut -d'"' -f2)" + newhash="$(nix-build -A goperf.go-modules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + fname="$(nix-instantiate --eval -E 'with import ./. {}; (builtins.unsafeGetAttrPos "version" goperf).file' | cut -d'"' -f2)" + ${lib.getExe sd} --string-mode "$oldhash" "$newhash" "$fname" + ''; + + meta = with lib; { + description = "Tools and packages for analyzing Go benchmark results"; + homepage = "https://cs.opensource.google/go/x/perf"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 683e701b07d59..0df1b97b15204 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, fetchurl, makeWrapper, nodejs }: +{ stdenv, lib, fetchzip, makeWrapper, nodejs, writeScript }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "heroku"; - version = "7.66.4"; + version = "8.7.1"; - src = fetchurl { - url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "sha256-AAiC88RBqR5RXeIj39in7hlvI3JNQB6KUwGmt9jo93A="; + src = fetchzip { + url = "https://cli-assets.heroku.com/versions/8.7.1/3f5e369/heroku-v8.7.1-3f5e369-linux-x64.tar.xz"; + hash = "sha256-3pCutQBS8N1Yw4JKTvU046UrOxBi0wLRQywxwezAEeU="; }; nativeBuildInputs = [ makeWrapper ]; @@ -22,6 +22,19 @@ stdenv.mkDerivation rec { --set HEROKU_DISABLE_AUTOUPDATE 1 ''; + passthru.updateScript = writeScript "update-heroku" '' + #!/usr/bin/env nix-shell + #!nix-shell -I nixpkgs=./. -i bash -p nix-prefetch curl jq common-updater-scripts + resp="$( + curl -L "https://cli-assets.heroku.com/versions/heroku-linux-x64-tar-xz.json" \ + | jq '[to_entries[] | { version: .key, url: .value } | select(.version|contains("-")|not)] | sort_by(.version|split(".")|map(tonumber)) | .[-1]' + )" + url="$(jq <<<"$resp" .url --raw-output)" + version="$(jq <<<"$resp" .version --raw-output)" + hash="$(nix-prefetch fetchzip --url "$(jq <<<"$resp" .url --raw-output)")" + update-source-version heroku "$version" "$hash" "$url" + ''; + meta = { homepage = "https://devcenter.heroku.com/articles/heroku-cli"; description = "Everything you need to get started using Heroku"; diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index f5afe959967a6..b60011095f448 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PSJNPN5hd5Tgt6F70II2gMiUiU0irncSefm6Q7WjUDE="; + sha256 = "sha256-rZDLnr3FNLNOadmST70p5ZusK+p9SiUmVrnc5TrKuK4="; }; - vendorHash = "sha256-0zWTVE82GaSyWfgbRASpNdO/d4kKOts1XdPspmgfpV8="; + vendorHash = "sha256-gaY3U6+Emk6La5wPyT5TvgTwPsh2Ws2t7C8B5T4c46E="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/language-servers/emmet-language-server/default.nix b/pkgs/development/tools/language-servers/emmet-language-server/default.nix new file mode 100644 index 0000000000000..09e08aa6477b4 --- /dev/null +++ b/pkgs/development/tools/language-servers/emmet-language-server/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "emmet-language-server"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "olrtg"; + repo = "emmet-language-server"; + rev = "v${version}"; + hash = "sha256-53FbZ0hC2s9o6yXPYAy0vqe4tLcYMHLqeBMNuNI8Nd0="; + }; + + npmDepsHash = "sha256-luE8iYfTsSrBVcv0sE1yYnAksE2+icx9K4yNzjUV7U4="; + + # Upstream doesn't have a lockfile + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + meta = with lib; { + description = "A language server for emmet.io"; + homepage = "https://github.com/olrtg/emmet-language-server"; + changelog = "https://github.com/olrtg/emmet-language-server/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ stnley ]; + mainProgram = "emmet-language-server"; + }; +} diff --git a/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json b/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json new file mode 100644 index 0000000000000..c82924552b672 --- /dev/null +++ b/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json @@ -0,0 +1,896 @@ +{ + "name": "@olrtg/emmet-language-server", + "version": "2.2.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@olrtg/emmet-language-server", + "version": "2.2.0", + "license": "MIT", + "dependencies": { + "@vscode/emmet-helper": "^2.9.2", + "bumpp": "^9.1.1", + "vscode-languageserver": "^8.1.0", + "vscode-languageserver-textdocument": "^1.0.8" + }, + "bin": { + "emmet-language-server": "dist/index.js" + }, + "devDependencies": { + "@tsconfig/recommended": "^1.0.2", + "typescript": "^5.1.6" + } + }, + "node_modules/@emmetio/abbreviation": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz", + "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==", + "dependencies": { + "@emmetio/scanner": "^1.0.4" + } + }, + "node_modules/@emmetio/css-abbreviation": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz", + "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==", + "dependencies": { + "@emmetio/scanner": "^1.0.4" + } + }, + "node_modules/@emmetio/scanner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz", + "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==" + }, + "node_modules/@jsdevtools/ez-spawn": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@jsdevtools/ez-spawn/-/ez-spawn-3.0.4.tgz", + "integrity": "sha512-f5DRIOZf7wxogefH03RjMPMdBF7ADTWUMoOs9kaJo06EfwF+aFhMZMDZxHg/Xe12hptN9xoZjGso2fdjapBRIA==", + "dependencies": { + "call-me-maybe": "^1.0.1", + "cross-spawn": "^7.0.3", + "string-argv": "^0.3.1", + "type-detect": "^4.0.8" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@tsconfig/recommended": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/recommended/-/recommended-1.0.3.tgz", + "integrity": "sha512-+jby/Guq9H8O7NWgCv6X8VAiQE8Dr/nccsCtL74xyHKhu2Knu5EAKmOZj3nLCnLm1KooUzKY+5DsnGVqhM8/wQ==", + "dev": true + }, + "node_modules/@vscode/emmet-helper": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.9.2.tgz", + "integrity": "sha512-MaGuyW+fa13q3aYsluKqclmh62Hgp0BpKIqS66fCxfOaBcVQ1OnMQxRRgQUYnCkxFISAQlkJ0qWWPyXjro1Qrg==", + "dependencies": { + "emmet": "^2.4.3", + "jsonc-parser": "^2.3.0", + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-languageserver-types": "^3.15.1", + "vscode-uri": "^2.1.2" + } + }, + "node_modules/acorn": { + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/bumpp": { + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/bumpp/-/bumpp-9.2.0.tgz", + "integrity": "sha512-pgp7y3jp33QTaXFVDrE0IKuZF5Y8EsIz+ywZXFALW2nD+ZD+4crxJe/GypBQBoJuZrr5dc6TGrR3wl7fk3+C6w==", + "dependencies": { + "@jsdevtools/ez-spawn": "^3.0.4", + "c12": "^1.4.2", + "cac": "^6.7.14", + "fast-glob": "^3.3.1", + "prompts": "^2.4.2", + "semver": "^7.5.4" + }, + "bin": { + "bumpp": "bin/bumpp.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/c12": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/c12/-/c12-1.4.2.tgz", + "integrity": "sha512-3IP/MuamSVRVw8W8+CHWAz9gKN4gd+voF2zm/Ln6D25C2RhytEZ1ABbC8MjKr4BR9rhoV1JQ7jJA158LDiTkLg==", + "dependencies": { + "chokidar": "^3.5.3", + "defu": "^6.1.2", + "dotenv": "^16.3.1", + "giget": "^1.1.2", + "jiti": "^1.18.2", + "mlly": "^1.4.0", + "ohash": "^1.1.2", + "pathe": "^1.1.1", + "perfect-debounce": "^1.0.0", + "pkg-types": "^1.0.3", + "rc9": "^2.1.1" + } + }, + "node_modules/cac": { + "version": "6.7.14", + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", + "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/call-me-maybe": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz", + "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==" + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, + "node_modules/colorette": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==" + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/defu": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.2.tgz", + "integrity": "sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==" + }, + "node_modules/destr": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.1.tgz", + "integrity": "sha512-M1Ob1zPSIvlARiJUkKqvAZ3VAqQY6Jcuth/pBKQ2b1dX/Qx0OnJ8Vux6J2H5PTMQeRzWrrbTu70VxBfv/OPDJA==" + }, + "node_modules/dotenv": { + "version": "16.3.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", + "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, + "node_modules/emmet": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.6.tgz", + "integrity": "sha512-dJfbdY/hfeTyf/Ef7Y7ubLYzkBvPQ912wPaeVYpAxvFxkEBf/+hJu4H6vhAvFN6HlxqedlfVn2x1S44FfQ97pg==", + "dependencies": { + "@emmetio/abbreviation": "^2.3.3", + "@emmetio/css-abbreviation": "^2.1.8" + } + }, + "node_modules/fast-glob": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fastq": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/giget": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/giget/-/giget-1.1.2.tgz", + "integrity": "sha512-HsLoS07HiQ5oqvObOI+Qb2tyZH4Gj5nYGfF9qQcZNrPw+uEFhdXtgJr01aO2pWadGHucajYDLxxbtQkm97ON2A==", + "dependencies": { + "colorette": "^2.0.19", + "defu": "^6.1.2", + "https-proxy-agent": "^5.0.1", + "mri": "^1.2.0", + "node-fetch-native": "^1.0.2", + "pathe": "^1.1.0", + "tar": "^6.1.13" + }, + "bin": { + "giget": "dist/cli.mjs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/jiti": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz", + "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==", + "bin": { + "jiti": "bin/jiti.js" + } + }, + "node_modules/jsonc-parser": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", + "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==" + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "engines": { + "node": ">=6" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mlly": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz", + "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==", + "dependencies": { + "acorn": "^8.10.0", + "pathe": "^1.1.1", + "pkg-types": "^1.0.3", + "ufo": "^1.3.0" + } + }, + "node_modules/mri": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/node-fetch-native": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.4.0.tgz", + "integrity": "sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==" + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ohash": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.3.tgz", + "integrity": "sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==" + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/pathe": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz", + "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==" + }, + "node_modules/perfect-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", + "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pkg-types": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz", + "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==", + "dependencies": { + "jsonc-parser": "^3.2.0", + "mlly": "^1.2.0", + "pathe": "^1.1.0" + } + }, + "node_modules/pkg-types/node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==" + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/rc9": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.1.tgz", + "integrity": "sha512-lNeOl38Ws0eNxpO3+wD1I9rkHGQyj1NU1jlzv4go2CtEnEQEUfqnIvZG7W+bC/aXdJ27n5x/yUjb6RoT9tko+Q==", + "dependencies": { + "defu": "^6.1.2", + "destr": "^2.0.0", + "flat": "^5.0.2" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" + }, + "node_modules/string-argv": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", + "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", + "engines": { + "node": ">=0.6.19" + } + }, + "node_modules/tar": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "engines": { + "node": ">=4" + } + }, + "node_modules/typescript": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/ufo": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz", + "integrity": "sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==" + }, + "node_modules/vscode-jsonrpc": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz", + "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/vscode-languageserver": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz", + "integrity": "sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw==", + "dependencies": { + "vscode-languageserver-protocol": "3.17.3" + }, + "bin": { + "installServerIntoExtension": "bin/installServerIntoExtension" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz", + "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==", + "dependencies": { + "vscode-jsonrpc": "8.1.0", + "vscode-languageserver-types": "3.17.3" + } + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz", + "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==" + }, + "node_modules/vscode-languageserver-types": { + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz", + "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==" + }, + "node_modules/vscode-uri": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", + "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==" + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } +} diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index a331e3613e5b3..e8b9d9229b309 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.13.5" +version = "0.14.0" dependencies = [ "config", "diagnostic", @@ -97,9 +97,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "cc" @@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.13.5" +version = "0.14.0" dependencies = [ "fast-hash", "str-util", @@ -127,15 +127,16 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" [[package]] name = "cm-syntax" -version = "0.13.5" +version = "0.14.0" dependencies = [ "lex-util", "paths", "slash-var-path", + "sml-file", "str-util", "text-size-util", ] @@ -143,7 +144,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "fast-hash", ] @@ -160,7 +161,7 @@ dependencies = [ [[package]] name = "config" -version = "0.13.5" +version = "0.14.0" dependencies = [ "fast-hash", "serde", @@ -188,7 +189,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.13.5" +version = "0.14.0" dependencies = [ "fast-hash", "once_cell", @@ -225,7 +226,7 @@ dependencies = [ [[package]] name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" [[package]] name = "diff" @@ -248,7 +249,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "log", ] @@ -261,9 +262,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -280,18 +281,18 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "drop_bomb", "rowan", @@ -301,7 +302,7 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "rustc-hash", ] @@ -314,9 +315,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -325,13 +326,13 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -347,9 +348,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -365,9 +366,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" @@ -384,13 +385,13 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -399,24 +400,24 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "nohash-hasher", ] [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.3", ] [[package]] name = "input" -version = "0.13.5" +version = "0.14.0" dependencies = [ "cm-syntax", "config", @@ -427,6 +428,7 @@ dependencies = [ "mlb-syntax", "paths", "slash-var-path", + "sml-file", "sml-file-syntax", "sml-fixity", "sml-namespace", @@ -464,7 +466,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.13.5" +version = "0.14.0" dependencies = [ "analysis", "anyhow", @@ -492,13 +494,13 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.13.5" +version = "0.14.0" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "line-index" @@ -512,9 +514,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "log" @@ -564,7 +566,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.13.5" +version = "0.14.0" dependencies = [ "analysis", "codespan-reporting", @@ -582,7 +584,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.13.5" +version = "0.14.0" dependencies = [ "anyhow", "env_logger", @@ -602,10 +604,11 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.13.5" +version = "0.14.0" dependencies = [ "fast-hash", "paths", + "sml-file", "sml-namespace", "str-util", "text-size-util", @@ -613,7 +616,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.13.5" +version = "0.14.0" dependencies = [ "config", "diagnostic", @@ -621,6 +624,7 @@ dependencies = [ "mlb-hir", "paths", "sml-comment", + "sml-file", "sml-file-syntax", "sml-fixity", "sml-hir", @@ -637,11 +641,12 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.13.5" +version = "0.14.0" dependencies = [ "lex-util", "paths", "slash-var-path", + "sml-file", "sml-namespace", "str-util", "text-size-util", @@ -700,7 +705,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.13.5" +version = "0.14.0" dependencies = [ "better-panic", ] @@ -708,7 +713,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "dunce", "fast-hash", @@ -721,16 +726,16 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "fast-hash", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pico-args" @@ -760,9 +765,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -790,18 +795,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.10.0" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -811,9 +816,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -822,9 +827,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rowan" @@ -853,11 +858,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.18" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -872,18 +877,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -892,9 +897,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -903,9 +908,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", @@ -914,16 +919,16 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[package]] name = "slash-var-path" -version = "0.13.5" +version = "0.14.0" dependencies = [ "fast-hash", "str-util", @@ -931,14 +936,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.13.5" +version = "0.14.0" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.13.5" +version = "0.14.0" dependencies = [ "fast-hash", "fmt-util", @@ -949,11 +954,12 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.13.5" +version = "0.14.0" dependencies = [ "config", "pretty_assertions", "sml-dynamics", + "sml-file", "sml-file-syntax", "sml-fixity", "sml-hir", @@ -964,11 +970,16 @@ dependencies = [ ] [[package]] +name = "sml-file" +version = "0.14.0" + +[[package]] name = "sml-file-syntax" -version = "0.13.5" +version = "0.14.0" dependencies = [ "config", "elapsed", + "sml-file", "sml-fixity", "sml-hir-lower", "sml-lex", @@ -979,7 +990,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.13.5" +version = "0.14.0" dependencies = [ "fast-hash", "once_cell", @@ -988,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.13.5" +version = "0.14.0" dependencies = [ "la-arena", "sml-lab", @@ -999,13 +1010,14 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.13.5" +version = "0.14.0" dependencies = [ "config", "cov-mark", "diagnostic", "fast-hash", "lex-util", + "sml-file", "sml-hir", "sml-path", "sml-syntax", @@ -1014,14 +1026,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.13.5" +version = "0.14.0" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.13.5" +version = "0.14.0" dependencies = [ "cov-mark", "diagnostic", @@ -1036,7 +1048,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7 [[package]] name = "sml-naive-fmt" -version = "0.13.5" +version = "0.14.0" dependencies = [ "fast-hash", "sml-comment", @@ -1045,11 +1057,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.13.5" +version = "0.14.0" [[package]] name = "sml-parse" -version = "0.13.5" +version = "0.14.0" dependencies = [ "diagnostic", "event-parse", @@ -1061,14 +1073,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.13.5" +version = "0.14.0" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.13.5" +version = "0.14.0" dependencies = [ "num-bigint", "num-traits", @@ -1077,7 +1089,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.13.5" +version = "0.14.0" dependencies = [ "chain-map", "config", @@ -1100,7 +1112,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.13.5" +version = "0.14.0" dependencies = [ "chain-map", "code-h2-md-map", @@ -1119,7 +1131,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.13.5" +version = "0.14.0" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1127,7 +1139,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.13.5" +version = "0.14.0" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1138,7 +1150,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.13.5" +version = "0.14.0" dependencies = [ "fast-hash", "sml-hir", @@ -1156,16 +1168,16 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "smol_str", ] [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -1175,7 +1187,7 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "char-name", "fast-hash", @@ -1189,9 +1201,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", @@ -1202,16 +1214,16 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] [[package]] name = "tests" -version = "0.13.5" +version = "0.14.0" dependencies = [ "analysis", "cm-syntax", @@ -1229,6 +1241,7 @@ dependencies = [ "pulldown-cmark", "serde_json", "slash-var-path", + "sml-file", "sml-syntax", "str-util", "text-pos", @@ -1237,7 +1250,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "line-index", "text-size-util", @@ -1252,7 +1265,7 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" dependencies = [ "text-size", ] @@ -1275,7 +1288,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" [[package]] name = "toml" @@ -1291,9 +1304,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -1314,7 +1327,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" [[package]] name = "ungrammar" @@ -1361,13 +1374,13 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" +source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -1431,6 +1444,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1461,6 +1483,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1473,6 +1510,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1485,6 +1528,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1497,6 +1546,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1509,6 +1564,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1521,6 +1582,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1533,6 +1600,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1545,17 +1618,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.16" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] [[package]] name = "xtask" -version = "0.13.5" +version = "0.14.0" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 6d9a0c6124f65..9efe4b1f45ad0 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.13.5"; + version = "0.14.0"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-pgCsDbFYRN7QMAIzgdNn0vo/KLAZzMgjzil0AjxjKEc="; + hash = "sha256-dTYnJofXzpkfXfS4RoJHqXEMlPKW5w1z+X39rL+VoQE="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-pLzkXx0twW4X3iHeiUT6KwEzXxYk0IhwISRqeaJVjvo="; + "char-name-0.1.0" = "sha256-zi5XI0exL0D0RMN5FlNqdXl5DDFEnvWOBZvgeUTMKKc="; "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8="; }; }; diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index f5a5eb8ee85ab..9e2ce1cb0a998 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-sEmbfX7W1juymAxcWwDNxI8d/o7NS2S+0TJM6Vi9aQo="; + hash = "sha256-3xUSxsY/+66xldkkGahyCun2SoL1njRkJtdqxlMczD8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-IkbXZu6iHRXjWFsLtRBDxwJio5sVVZvHylk1al0S+/c="; + vendorHash = "sha256-XrSq55Cz1ixawx9W7jw16tTxyAVZ8h71iA5zO+H8dCg="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 567e93efd67ed..26337b0dcc7dd 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.54"; + version = "0.2.55"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1DYK47pucEh423ySyBy3hwi6QeB/nNQvwapEJZYRX8E="; + hash = "sha256-OFtzqnXKj03papfBDQlgUonOA7eKGWDJeVZmfFkPUcc="; }; vendorHash = "sha256-45UPm7ThTSRTgzaD4tXoTaeT4hRlMKn01mvgJS1I7zI="; diff --git a/pkgs/development/tools/misc/gpuvis/default.nix b/pkgs/development/tools/misc/gpuvis/default.nix index 83c04495f8cc7..d4476a9635255 100644 --- a/pkgs/development/tools/misc/gpuvis/default.nix +++ b/pkgs/development/tools/misc/gpuvis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gpuvis"; - version = "20211204"; + version = "0.1"; src = fetchFromGitHub { owner = "mikesart"; repo = pname; - rev = "7f47419470687c7ecbdf086b81f5bafdb05d1bef"; - sha256 = "sha256-29Bv+y0zWzn7QtpsjRV6hr19bCeyVJusPcYiAIEIluk="; + rev = "v${version}"; + hash = "sha256-a9eAYDsiwyzZc4FAPo0wANysisIT4qCHLh2PrYswJtw="; }; # patch dlopen path for gtk3 @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mikesart/gpuvis"; license = licenses.mit; maintainers = with maintainers; [ emantor ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 733966f470628..544a0221737e4 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -123,16 +123,17 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2023-11-17"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "8f48e4ddecbf403be35f8243b97d73cb39dd61bb"; - hash = "sha256-5q/7yz6jJedD8YU3SuYyXtN3qEAlOBRKGZxOcYt/0X8="; + rev = "4dc8fe0b08edc421c251270ccd4be3e5bf9d66b4"; + hash = "sha256-FjyMb5ZbPa2GLrRuFMUP/foKb0KvXFKThvgc9faFIw8="; }; buildInputs = [ + unzip libpqxx top-git mercurial @@ -179,7 +180,6 @@ stdenv.mkDerivation rec { makeWrapper pkg-config mdbook - unzip nukeReferences ]; diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index cfcd86f9dc2b1..78a04adde7977 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.5.125"; + version = "1.5.139"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${version}"; - sha256 = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go="; + sha256 = "sha256-t5usUGbcdLQlqPpZkNDeGncka9VfkpO7U933Kw/Sm7U="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/pkgs/development/tools/misc/phpunit/composer.lock b/pkgs/development/tools/misc/phpunit/composer.lock deleted file mode 100644 index b5b0a7cedb7f6..0000000000000 --- a/pkgs/development/tools/misc/phpunit/composer.lock +++ /dev/null @@ -1,1542 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "11284f406a2af1b4b94558b5910ea51c", - "packages": [ - { - "name": "myclabs/deep-copy", - "version": "1.11.1", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "conflict": { - "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" - }, - "require-dev": { - "doctrine/collections": "^1.6.8", - "doctrine/common": "^2.13.3 || ^3.2.2", - "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" - }, - "type": "library", - "autoload": { - "files": [ - "src/DeepCopy/deep_copy.php" - ], - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Create deep copies (clones) of your objects", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ], - "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" - }, - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" - } - ], - "time": "2023-03-08T13:26:56+00:00" - }, - { - "name": "nikic/php-parser", - "version": "v4.17.1", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.0" - }, - "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.9-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" - }, - "time": "2023-08-13T19:53:39+00:00" - }, - { - "name": "phar-io/manifest", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-phar": "*", - "ext-xmlwriter": "*", - "phar-io/version": "^3.0.1", - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" - }, - "time": "2021-07-20T11:28:43+00:00" - }, - { - "name": "phar-io/version", - "version": "3.2.1", - "source": { - "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.2.1" - }, - "time": "2022-02-21T01:04:05+00:00" - }, - { - "name": "phpunit/php-code-coverage", - "version": "10.1.9", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a56a9ab2f680246adcf3db43f38ddf1765774735", - "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-libxml": "*", - "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", - "php": ">=8.1", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-text-template": "^3.0", - "sebastian/code-unit-reverse-lookup": "^3.0", - "sebastian/complexity": "^3.0", - "sebastian/environment": "^6.0", - "sebastian/lines-of-code": "^2.0", - "sebastian/version": "^4.0", - "theseer/tokenizer": "^1.2.0" - }, - "require-dev": { - "phpunit/phpunit": "^10.1" - }, - "suggest": { - "ext-pcov": "PHP extension that provides line coverage", - "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "10.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.9" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-11-23T12:23:20+00:00" - }, - { - "name": "phpunit/php-file-iterator", - "version": "4.1.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c", - "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-08-31T06:24:48+00:00" - }, - { - "name": "phpunit/php-invoker", - "version": "4.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", - "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "ext-pcntl": "*", - "phpunit/phpunit": "^10.0" - }, - "suggest": { - "ext-pcntl": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Invoke callables with a timeout", - "homepage": "https://github.com/sebastianbergmann/php-invoker/", - "keywords": [ - "process" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-invoker/issues", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T06:56:09+00:00" - }, - { - "name": "phpunit/php-text-template", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748", - "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-08-31T14:07:24+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "6.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d", - "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "6.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T06:57:52+00:00" - }, - { - "name": "sebastian/cli-parser", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae", - "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library for parsing CLI options", - "homepage": "https://github.com/sebastianbergmann/cli-parser", - "support": { - "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T06:58:15+00:00" - }, - { - "name": "sebastian/code-unit", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "a81fee9eef0b7a76af11d121767abc44c104e503" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503", - "reference": "a81fee9eef0b7a76af11d121767abc44c104e503", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Collection of value objects that represent the PHP code units", - "homepage": "https://github.com/sebastianbergmann/code-unit", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit/issues", - "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T06:58:43+00:00" - }, - { - "name": "sebastian/code-unit-reverse-lookup", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", - "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T06:59:15+00:00" - }, - { - "name": "sebastian/comparator", - "version": "5.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", - "reference": "2db5010a484d53ebf536087a70b4a5423c102372", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-mbstring": "*", - "php": ">=8.1", - "sebastian/diff": "^5.0", - "sebastian/exporter": "^5.0" - }, - "require-dev": { - "phpunit/phpunit": "^10.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "5.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "https://github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-08-14T13:18:12+00:00" - }, - { - "name": "sebastian/complexity", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^4.10", - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library for calculating the complexity of PHP code units", - "homepage": "https://github.com/sebastianbergmann/complexity", - "support": { - "issues": "https://github.com/sebastianbergmann/complexity/issues", - "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-09-28T11:50:59+00:00" - }, - { - "name": "sebastian/diff", - "version": "5.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0", - "symfony/process": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "5.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-05-01T07:48:21+00:00" - }, - { - "name": "sebastian/environment", - "version": "6.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "suggest": { - "ext-posix": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "6.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "https://github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-04-11T05:39:26+00:00" - }, - { - "name": "sebastian/exporter", - "version": "5.1.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64f51654862e0f5e318db7e9dcc2292c63cdbddc", - "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=8.1", - "sebastian/recursion-context": "^5.0" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "5.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "https://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-09-24T13:22:09+00:00" - }, - { - "name": "sebastian/global-state", - "version": "6.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4", - "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "sebastian/object-reflector": "^3.0", - "sebastian/recursion-context": "^5.0" - }, - "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "6.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "security": "https://github.com/sebastianbergmann/global-state/security/policy", - "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-07-19T07:19:23+00:00" - }, - { - "name": "sebastian/lines-of-code", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/649e40d279e243d985aa8fb6e74dd5bb28dc185d", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^4.10", - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library for counting the lines of code in PHP source code", - "homepage": "https://github.com/sebastianbergmann/lines-of-code", - "support": { - "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-08-31T09:25:50+00:00" - }, - { - "name": "sebastian/object-enumerator", - "version": "5.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906", - "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "sebastian/object-reflector": "^3.0", - "sebastian/recursion-context": "^5.0" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "5.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T07:08:32+00:00" - }, - { - "name": "sebastian/object-reflector", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "24ed13d98130f0e7122df55d06c5c4942a577957" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957", - "reference": "24ed13d98130f0e7122df55d06c5c4942a577957", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T07:06:18+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "5.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "5.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "https://github.com/sebastianbergmann/recursion-context", - "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T07:05:40+00:00" - }, - { - "name": "sebastian/type", - "version": "4.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "462699a16464c3944eefc02ebdd77882bd3925bf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf", - "reference": "462699a16464c3944eefc02ebdd77882bd3925bf", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "require-dev": { - "phpunit/phpunit": "^10.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Collection of value objects that represent the types of the PHP type system", - "homepage": "https://github.com/sebastianbergmann/type", - "support": { - "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/4.0.0" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-03T07:10:45+00:00" - }, - { - "name": "sebastian/version", - "version": "4.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17", - "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/4.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2023-02-07T11:34:05+00:00" - }, - { - "name": "theseer/tokenizer", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - } - ], - "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "support": { - "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" - }, - "funding": [ - { - "url": "https://github.com/theseer", - "type": "github" - } - ], - "time": "2023-11-20T00:12:19+00:00" - } - ], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": true, - "prefer-lowest": false, - "platform": { - "php": ">=8.1", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*" - }, - "platform-dev": [], - "platform-overrides": { - "php": "8.1.0" - }, - "plugin-api-version": "2.6.0" -} diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix deleted file mode 100644 index 3442f95c31643..0000000000000 --- a/pkgs/development/tools/misc/phpunit/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, php }: - -php.buildComposerProject (finalAttrs: { - pname = "phpunit"; - version = "10.4.2"; - - src = fetchFromGitHub { - owner = "sebastianbergmann"; - repo = "phpunit"; - rev = finalAttrs.version; - hash = "sha256-7hgDeg8K+Iuo8Lb8mV5ACQV3BDBotKIZ0/IdlLCXuIc="; - }; - - # Add missing composer.lock - # https://github.com/sebastianbergmann/phpunit/pull/5576 - composerLock = ./composer.lock; - vendorHash = "sha256-PYcXB8MEhZabAreR2GluyrEkgnTvUEgEkfFnUT5Fqps="; - - meta = { - changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; - description = "PHP Unit Testing framework"; - homepage = "https://phpunit.de"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.onny ] ++ lib.teams.php.members; - }; -}) diff --git a/pkgs/development/tools/misc/segger-ozone/default.nix b/pkgs/development/tools/misc/segger-ozone/default.nix index 9e048df457678..8109c1e42a368 100644 --- a/pkgs/development/tools/misc/segger-ozone/default.nix +++ b/pkgs/development/tools/misc/segger-ozone/default.nix @@ -1,14 +1,13 @@ -{ stdenv +{ lib +, stdenv , fetchurl +, autoPatchelfHook , fontconfig , freetype -, lib , libICE , libSM -, udev , libX11 , libXcursor -, libXext , libXfixes , libXrandr , libXrender @@ -16,42 +15,45 @@ stdenv.mkDerivation rec { pname = "segger-ozone"; - version = "3.28e"; + version = "3.30b"; - src = fetchurl { - url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${(lib.replaceStrings ["."] [""] version)}_x86_64.tgz"; - sha256 = "BfmKBAKyTA0V31zkwFLrbT0Xob221KfHa6v0VxKFsSI="; - }; + src = { + x86_64-linux = fetchurl { + url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${builtins.replaceStrings ["."] [""] version}_x86_64.tgz"; + hash = "sha256-W8Fo0q58pAn1aB92CjYARcN3vMLEguvsyozsS7VRArQ="; + }; + i686-linux = fetchurl { + url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${builtins.replaceStrings ["."] [""] version}_i386.tgz"; + hash = "sha256-Xq/69lwF2Ll5VdkYMDNRtc0YUUvWc+XR0FHJXxOLNQ4="; + }; + }.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + + nativeBuildInputs = [ + autoPatchelfHook + ]; - rpath = lib.makeLibraryPath [ + buildInputs = [ fontconfig freetype libICE libSM - udev libX11 libXcursor - libXext libXfixes libXrandr libXrender - ] - + ":${stdenv.cc.cc.lib}/lib64"; + stdenv.cc.cc.lib + ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin mv Lib lib mv * $out ln -s $out/Ozone $out/bin - ''; - - postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Ozone" \ - --set-rpath ${rpath}:$out/lib "$out/Ozone" - for file in $(find $out/lib -maxdepth 1 -type f -and -name \*.so\*); do - patchelf --set-rpath ${rpath}:$out/lib $file - done + runHook postInstall ''; meta = with lib; { @@ -80,6 +82,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.bmilanov ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index ea725b013180b..aeca3c437ff4d 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -9,15 +9,15 @@ stdenv.mkDerivation { pname = "ycmd"; - version = "unstable-2022-08-15"; + version = "unstable-2023-11-06"; disabled = !python.isPy3k; # required for third_party directory creation src = fetchFromGitHub { owner = "ycm-core"; repo = "ycmd"; - rev = "323d4b60f077bd07945f25a60c4584843ca851fb"; - sha256 = "sha256-5IpXMQc3QIkKJkUrOPSRzciLvL1nhQw6wlP+pVnIucE="; + rev = "0607eed2bc211f88f82657b7781f4fe66579855b"; + hash = "sha256-SzEcMQ4lX7NL2/g9tuhA6CaZ8pX/DGs7Fla/gr+RcOU="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index e7a12deb3ee40..6104aadf0492b 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -35,7 +35,7 @@ let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; - mysqlShellVersion = "8.2.0"; + mysqlShellVersion = "8.2.1"; mysqlServerVersion = "8.2.0"; in stdenv.mkDerivation (finalAttrs: { @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { }) (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-kuRo+3vcDtc9aOgAuxJTy0e6E85iOFfCx/ZHtrNg08k="; + hash = "sha256-m6WdFow28bxW52q+m8PniZCU/1Ej4secdPQi8GKlziE="; }) ]; diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index a9b76710605ed..257819f4ad3b7 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.42.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-s/piZ8sCdBz5zFW9i7xdVrf7dQiMjQp/ixCDjFh5SLc="; + hash = "sha256-DgKGnIA2ovBLja+r+nYZ97UPaWO7a7RXeXa10guZBTc="; }; - cargoHash = "sha256-4iJghmSXsaijNCvYyrM3dEsqCDk6zeTU92oP5Qs6tOY="; + cargoHash = "sha256-Sv9i8f0ywMNvjA2yvCX+2ZhFuNCovEGiaMxkg/IV36g="; nativeBuildInputs = [ makeWrapper @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { # This is an FHS specific assert depending on glibc location checkFlags = [ "--skip=dependencies::resolve_test" + "--skip=run_cargo_deb_command_on_example_dir_with_separate_debug_symbols" ]; postInstall = '' diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 29c0e5302a040..6c0b02c189dbb 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/est31/cargo-udeps"; license = licenses.mit; maintainers = with maintainers; [ b4dm4n matthiasbeyer ]; + mainProgram = "cargo-udeps"; }; } diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index 99c10f7d21f68..3b3418f38dc06 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "13.2.0"; + version = "13.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-yMHGn/RPtYuxS3rHzm87mW7nBUEaSOGsCT7Ckxvhabk="; + sha256 = "sha256-owiMVeH7m4LoM8c4qjLyFx3v/+Flzt+C+O8qEuXazvc="; }; - cargoHash = "sha256-hO2W0NRV9fGHnnS1kOkQ+e0sFzVSBQk3MOm8qDYbA00="; + cargoHash = "sha256-WtNH62DBo6WFOUcHnZxn0Jco4SUmhO0+1wXPRB2wxic="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/ravedude/default.nix b/pkgs/development/tools/rust/ravedude/default.nix index ea5812e5ad1ef..aeb44664cf6c1 100644 --- a/pkgs/development/tools/rust/ravedude/default.nix +++ b/pkgs/development/tools/rust/ravedude/default.nix @@ -3,28 +3,40 @@ , fetchCrate , pkg-config , udev +, nix-update-script +, testers +, ravedude }: rustPlatform.buildRustPackage rec { pname = "ravedude"; - version = "0.1.5"; + version = "0.1.6"; src = fetchCrate { inherit pname version; - hash = "sha256-wcY9fvfIn1pWMAh5FI/QFl18CV2xjmRGSwwoRfGvujo="; + hash = "sha256-LhPRz3DUMDoe50Hq3yO+2BHpyh5fQ4sMNGLttjkdSZw="; }; - cargoHash = "sha256-AOIrB0FRagbA2+JEURF41d+th0AbR++U5WKCcZmh4Os="; + cargoHash = "sha256-Uo8wlTAHBkn/WeGPhPP+BU80wjSyNHsWQj8QvA7mHrk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = ravedude; + version = "v${version}"; + }; + }; + meta = with lib; { description = "Tool to easily flash code onto an AVR microcontroller with avrdude"; homepage = "https://crates.io/crates/ravedude"; license = with licenses; [ mit /* or */ asl20 ]; platforms = platforms.linux; maintainers = with maintainers; [ rvarago ]; + mainProgram = "ravedude"; }; } diff --git a/pkgs/development/tools/sca2d/default.nix b/pkgs/development/tools/sca2d/default.nix index eb28e7acb026c..eb745e5bd2c62 100644 --- a/pkgs/development/tools/sca2d/default.nix +++ b/pkgs/development/tools/sca2d/default.nix @@ -16,6 +16,8 @@ let sha256 = "sha256-ctdPPKPSD4weidyhyj7RCV89baIhmuxucF3/Ojx1Efo="; }; + patches = [ ]; + disabledTestPaths = [ "tests/test_nearley/test_nearley.py" ]; }); }; diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 9a89aa22c8095..11a2bfe4e24b8 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.16.2"; + version = "5.16.3"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-5YIv4Y46PnyvYt1GQZUrL1/00LldbGDqGjjpys3Sphs="; + hash = "sha256-CaH0NRK0KvR2F8/Fov16uzig5BvwRuUNf4SDFDu/SLs="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch index 6109101b7ba9c..75b8f0cf8dfe5 100644 --- a/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch +++ b/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch @@ -214,7 +214,7 @@ index edae9b477..782904f49 100644 cloud init command '%{cmd}' failed on guest '%{guest_name}'. command_deprecated: |- The command 'vagrant %{name}' has been deprecated and is no longer functional -@@ -1238,23 +1238,6 @@ en: +@@ -1245,30 +1245,6 @@ en: following command: vagrant plugin install --local @@ -225,12 +225,19 @@ index edae9b477..782904f49 100644 - again. - plugin_missing_library: |- - Vagrant failed to install the requested plugin because it depends -- on a library which is not currently installed on this system. The -- following library is required by the '%{name}' plugin: +- on development files for a library which is not currently installed +- on this system. The following library is required by the '%{name}' +- plugin: - - %{library} - -- Please install the library and then run the command again. +- If a package manager is used on this system, please install the development +- package for the library. The name of the package will be similar to: +- +- %{library}-dev or %{library}-devel +- +- After the library and development files have been installed, please +- run the command again. - plugin_missing_ruby_dev: |- - Vagrant failed to install the requested plugin because the Ruby header - files could not be found. Install the ruby development package for your diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 3b03e4426ba60..5dc9e46671e91 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.3.4"; + version = "2.3.7"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "sha256-Q+sUYcbc/SOgw4ZXDmwqh24G0jiLvA8fDJyZ45OqLw8="; + hash = "sha256-+oqWMZqnuf9fSpkbd8vzf1SVSdhHN2JLzr76jyAEv0U="; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -21,7 +21,7 @@ let vagrant = { source = { type = "url"; - inherit url sha256; + inherit url hash; }; inherit version; }; @@ -48,7 +48,7 @@ in buildRubyGem rec { doInstallCheck = true; dontBuild = false; - src = fetchurl { inherit url sha256; }; + src = fetchurl { inherit url hash; }; patches = [ ./unofficial-installation-nowarn.patch @@ -98,13 +98,6 @@ in buildRubyGem rec { HOME="$(mktemp -d)" $out/bin/vagrant init --output - > /dev/null ''; - # `patchShebangsAuto` patches this one script which is intended to run - # on foreign systems. - postFixup = '' - sed -i -e '1c#!/bin/sh -' \ - $out/lib/ruby/gems/*/gems/vagrant-*/plugins/provisioners/salt/bootstrap-salt.sh - ''; - passthru = { inherit ruby deps; }; diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix index 438d436869f6f..d31b76a4e7f87 100644 --- a/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s8b3bsajwjyrjs53h0nrfrpzzgi8igsrslprhr6fgl80ig3plld"; + sha256 = "sha256-z0VkRqFk3JU02ULQ+xQbywekzrJgz1YPDul//Ov5ajU="; type = "gem"; }; - version = "0.9.0"; + version = "0.11.0"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; @@ -109,10 +109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "sha256-RrLSRMxv8BqJv2EnRpDAn9vcpHqErp6sOQOegSMa7nw="; type = "gem"; }; - version = "2.8.0"; + version = "2.8.2"; }; multi_json = { groups = ["default"]; @@ -130,20 +130,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; + sha256 = "sha256-INyAC4++TE9LWxZOaqOrgqNxvLJ+toXBZpYcNN2KItc="; type = "gem"; }; - version = "1.13.6"; + version = "1.15.2"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "sha256-r2QSSDb908AOgwcD1/hz6l3qvekj83AGo59aXg2hY4c="; type = "gem"; }; - version = "1.6.0"; + version = "1.7.1"; }; rexml = { groups = ["default"]; @@ -155,6 +155,26 @@ }; version = "3.2.5"; }; + xml-simple = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "sha256-0hEx5RnIbxpbwrbS1X1G5pmOR/GO0kmyXK2GQz29aV0="; + type = "gem"; + }; + version = "1.1.9"; + }; + diffy = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "sha256-NrQv++UTjdxWGCEHwkrY1rBm7P0odoKfOR46SZPYmuE="; + type = "gem"; + }; + version = "3.4.2"; + }; ruby-libvirt = { groups = ["default"]; platforms = []; @@ -166,14 +186,14 @@ version = "0.8.0"; }; vagrant-libvirt = { - dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml"]; + dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple" "diffy"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j31y6sjhslj5yr0ssvb36ngm7prfsbdfj6131757jl0l0ri8pyv"; + sha256 = "sha256-NMiRjrVQo2Ui9nOJwpDmNJUk+95gsT85pwFMIiw3bwQ="; type = "gem"; }; - version = "0.8.2"; + version = "0.12.2"; }; } diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix index caddb568c65f0..911ee57a6932c 100644 --- a/pkgs/development/tools/vsce/default.nix +++ b/pkgs/development/tools/vsce/default.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.21.1"; + version = "2.22.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-cFqjoWQu/6cvbT1vxReERybuKpeL4LCVl5qhvSwr6fs="; + hash = "sha256-zpZ/PsqZ9yRDKTXkSrcBgSxYer7JdjNZqsseHwfzkEY="; }; npmDepsHash = "sha256-Difk9a9TYmfwzP9SawEuaxm7iHVjdfO+FxFCE7aEMzM="; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index c87f49aa7cb41..fec8f6c7ad48d 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -7,9 +7,9 @@ , stdenv , curl , Security -, version ? "0.2.88" -, hash ? "sha256-CpyB2poKIqP4Zfn3Gk1hA9m6EQ/ZiyO91wZViMH7Wsk=" -, cargoHash ? "sha256-0D5ABJ3jwsrFIvXSOYgOqJtV5B9JUsHZfJEKl6PO47I=" +, version ? "0.2.89" +, hash ? "sha256-IPxP68xtNSpwJjV2yNMeepAS0anzGl02hYlSTvPocz8=" +, cargoHash ? "sha256-pBeQaG6i65uJrJptZQLuIaCb/WCQMhba1Z1OhYqA8Zc=" }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 9dbbd19d46808..ada98eb33b477 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.40.1"; + version = "4.40.4"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-S2hsZkospf1VMH/fDLiALEraOA8dbG62JejGY2T/tRU="; + hash = "sha256-cEOOaQAduL9a+EwWigzPDN1ABM6wEjEc8dV4ESFkMXA="; }; - vendorHash = "sha256-ggb8ZX2KBj/oY+vomCme/7KlnfsykMm4l027kwlxpWY="; + vendorHash = "sha256-kFDW8HrBhSuflAbuC6Zs/61OLXPsfPQfYU7Laa7eK9c="; nativeBuildInputs = [ installShellFiles ]; @@ -23,7 +23,7 @@ buildGoModule rec { ''; passthru.tests = { - simple = runCommand "${pname}-test" {} '' + simple = runCommand "${pname}-test" { } '' echo "test: 1" | ${yq-go}/bin/yq eval -j > $out [ "$(cat $out | tr -d $'\n ')" = '{"test":1}' ] ''; diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 557e0aff6e271..884b73e9ede8b 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zed"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d/XJirgJlS4jTlmATQpFH+Yn7M4EdY0yNDKM1A2NjoA="; + sha256 = "sha256-jW++0am4UfMR9f4Qib7LSald06MzjDVTBWJKV4Ebbsw="; }; - vendorHash = "sha256-n/7HV3dyV8qsJeEk+vikZvuM5G7nf0QOwVBtInJdU2k="; + vendorHash = "sha256-BWvMy1dc3PzAc3kDTXtI6Y8kjRGLWR+aUleItg5EgRU="; subPackages = [ "cmd/zed" "cmd/zq" ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index bd2b6e016d4be..d224af5312763 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.14"; + version = "1.0.15"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-15YHmf3hJtkRXV8JO2P6XEx3ySOmaXIXU++pt6xl7fM="; + hash = "sha256-3EUVa/v/1Q42IPysoUT/N7Adtwq//79ibTpQgrpzl1I="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-DEsYsn6zuUVFt6LerkMIb8bIPvCL6bW2qtX3fg6QLvw="; + hash = "sha256-WEt/oIleK3f+waEIiR+umdbxvMpeF+sTVTcy1DE0yKY="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-kZTp/L/C+8zs7mY9wogM5zRYjXXvLEEW8a1GzyhuQyA="; + hash = "sha256-VGJYg3im6KzS3YZevorzeomYQIiYVEVP1K7YIXRzzUE="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-8ixHAN2VpeEdixoq8Aw4KwG+B7bw5u35XVT5TFZzeRE="; + hash = "sha256-8US2sbirFOAFXfGvHm9VqPORjUzJN/K+0/BcgK4FVcI="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 27303fb86020a..09d266ff97378 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.38.2"; + version = "1.38.4"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-DLVeI1pnHpUya8muVUP6VNXiLmlaedOOPPef3tHNOng="; + hash = "sha256-Jve2aKfnWZotgzfzUJ+ez+9sainmQiUg3x8FIWnr6/o="; }; - cargoHash = "sha256-qTvPpUBinPm3eQ5PLcqdCcZEG5Q6kGyt35mL914K9jk="; + cargoHash = "sha256-pDDi0Xm1o61Ng308MeTVoVp+cYVFt34Kh4sj2idH+9s="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index af3af652fb710..ddcbc75cd24f9 100644 --- a/pkgs/development/web/nodejs/v21.nix +++ b/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.2.0"; - sha256 = "sha256-1Xyc6jlHZPodmvUeUsdEn3EZPp1ExKgfvt7GU+yCdwc="; + version = "21.3.0"; + sha256 = "sha256-q0Fy7IJ/dwxsO0tvMIJBBBN+2kdISOhNVe1Vs0HmdyU="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch |