···9999 name = "git-annex-${super.git-annex.version}-src";
100100 url = "git://git-annex.branchable.com/";
101101 rev = "refs/tags/" + super.git-annex.version;
102102- sha256 = "19n60rx4mpr52551mvm0i5kgy32099rvgnihvmh5np09n2f81c2r";
102102+ sha256 = "0dw89528kzbisbilyx6ggrh25vslivyylr8xk4dc4cikhd6dkm7p";
103103 # delete android and Android directories which cause issues on
104104 # darwin (case insensitive directory). Since we don't need them
105105 # during the build process, we can delete it to prevent a hash
···10201020 (super.stack.overrideScope (self: super: {
10211021 # Needs Cabal-3.6
10221022 Cabal = self.Cabal_3_6_3_0;
10231023+ # Official stack ships with hpack-0.35.0. Nixpkgs uses the same
10241024+ # version of hpack so that users who get stack from Nixpkgs
10251025+ # generate the same .cabal files as users who download official binaries
10261026+ # of stack.
10271027+ #
10281028+ # dontCheck is used because one of the hpack tests appears to be
10291029+ # incorrectly(?) failing:
10301030+ # https://github.com/sol/hpack/issues/528
10311031+ hpack = dontCheck self.hpack_0_35_0;
10231032 })));
1024103310251034 # Too strict version bound on hashable-time.
···738738 testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or [];
739739 }) super.retrie_1_2_0_0;
740740741741- haskell-language-server = overrideCabal (drv: {
741741+ haskell-language-server = let
742742+ # This wrapper will be included in the sdist in the next release, then we can remove this custom fetch.
743743+ abi-compat-check-wrapper = assert super.haskell-language-server.version == "1.8.0.0"; pkgs.fetchurl {
744744+ url = "https://raw.githubusercontent.com/haskell/haskell-language-server/c12379c57ab8f0abd606e9f397de54e508d024a0/bindist/wrapper.in";
745745+ sha256 = "sha256-vHi6+s8/V4WJSCxIqjP+thumEpttokpCc+a823WEPPk=";
746746+ }; in
747747+ overrideCabal (drv: {
742748 # starting with 1.6.1.1 haskell-language-server wants to be linked dynamically
743749 # by default. Unless we reflect this in the generic builder, GHC is going to
744750 # produce some illegal references to /build/.
745751 enableSharedExecutables = true;
746746- postInstall = "ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${self.ghc.version}";
752752+ # The shell script wrapper checks that the runtime ghc and its boot packages match the ghc hls was compiled with.
753753+ # This prevents linking issues when running TH splices.
754754+ postInstall = ''
755755+ mv "$out/bin/haskell-language-server" "$out/bin/.haskell-language-server-${self.ghc.version}-unwrapped"
756756+ BOOT_PKGS=`ghc-pkg-${self.ghc.version} --global list --simple-output`
757757+ ${pkgs.buildPackages.gnused}/bin/sed \
758758+ -e "s!@@EXE_DIR@@!$out/bin!" \
759759+ -e "s/@@EXE_NAME@@/.haskell-language-server-${self.ghc.version}-unwrapped/" \
760760+ -e "s/@@GHC_VERSION@@/${self.ghc.version}/" \
761761+ -e "s/@@BOOT_PKGS@@/$BOOT_PKGS/" \
762762+ -e "s/@@ABI_HASHES@@/$(for dep in $BOOT_PKGS; do printf "%s:" "$dep" && ghc-pkg-${self.ghc.version} field $dep abi --simple-output ; done | tr '\n' ' ' | xargs)/" \
763763+ -e "s!Consider installing ghc.* via ghcup or build HLS from source.!Visit https://haskell4nix.readthedocs.io/nixpkgs-users-guide.html#how-to-install-haskell-language-server to learn how to correctly install a matching hls for your ghc with nix.!" \
764764+ ${abi-compat-check-wrapper} > "$out/bin/haskell-language-server"
765765+ ln -s "$out/bin/haskell-language-server" "$out/bin/haskell-language-server-${self.ghc.version}"
766766+ chmod +x "$out/bin/haskell-language-server"
767767+ '';
747768 testToolDepends = [ self.cabal-install pkgs.git ];
748769 testTarget = "func-test"; # wrapper test accesses internet
749770 preCheck = ''
···2929 platforms = platforms.all;
3030 maintainers = with maintainers; [ malbarbo ];
3131 license = licenses.mit;
3232+ knownVulnerabilities = [
3333+ # wasm3 expects all wasm code to be pre-validated, any users
3434+ # should be aware that running unvalidated wasm will potentially
3535+ # lead to RCE until upstream have added a builtin validator
3636+ "CVE-2022-39974"
3737+ "CVE-2022-34529"
3838+ "CVE-2022-28990"
3939+ "CVE-2022-28966"
4040+ "CVE-2021-45947"
4141+ "CVE-2021-45946"
4242+ "CVE-2021-45929"
4343+ "CVE-2021-38592"
4444+ ];
3245 };
3346}
+3
pkgs/development/libraries/jemalloc/default.nix
···3333 # AArch64 has configurable page size up to 64k. The default configuration
3434 # for jemalloc only supports 4k page sizes.
3535 ++ lib.optional stdenv.isAarch64 "--with-lg-page=16"
3636+ # See https://github.com/jemalloc/jemalloc/issues/1997
3737+ # Using a value of 48 should work on both emulated and native x86_64-darwin.
3838+ ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--with-lg-vaddr=48"
3639 ;
37403841 NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds";
···1111# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
1212python3Packages.buildPythonApplication rec {
1313 pname = "diffoscope";
1414- version = "222";
1414+ version = "223";
15151616 src = fetchurl {
1717 url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
1818- sha256 = "sha256-2TiDHWPwkAXBHnfQ+1h98F+YvqpxcEmmHXt0EWL3MKY=";
1818+ sha256 = "sha256-9QyMTYqaxRnVonVedLDGOgeK9/j39//zkzta9ngcNro=";
1919 };
20202121 outputs = [ "out" "man" ];
+1-1
pkgs/top-level/aliases.nix
···743743 mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2022-09-24
744744 murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2022-09-24
745745 mutt-with-sidebar = mutt; # Added 2022-09-17
746746- mysql-client = throw "'mysql-client' has been renamed to/replaced by 'hiPrio'"; # Converted to throw 2022-09-24
746746+ mysql-client = throw "'mysql-client' has been renamed to/replaced by 'mariadb.client'"; # Converted to throw 2022-09-24
747747 mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2022-09-24
748748749749 mesa_drivers = throw "'mesa_drivers' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-09-24