···147 intltool148 gtk-doc149 perl0150 ];151152 # use locales from cinnamon-translations (not using --localedir because datadir is used)···183 sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py184185 patchShebangs src/data-to-c.pl00000000000186 '';187188 passthru = {
···147 intltool148 gtk-doc149 perl150+ python3.pkgs.wrapPython151 ];152153 # use locales from cinnamon-translations (not using --localedir because datadir is used)···182 sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py183184 patchShebangs src/data-to-c.pl185+ '';186+187+ preFixup = ''188+ # https://github.com/NixOS/nixpkgs/issues/101881189+ gappsWrapperArgs+=(190+ --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"191+ )192+193+ # https://github.com/NixOS/nixpkgs/issues/129946194+ buildPythonPath "${python3.pkgs.xapp}"195+ patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py196 '';197198 passthru = {
+16-22
pkgs/development/compilers/ghc/9.4.1.nix
···177assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;178179stdenv.mkDerivation (rec {180- version = "9.4.0.20220721";181 pname = "${targetPrefix}ghc${variantSuffix}";182183 src = fetchurl {184- url = "https://downloads.haskell.org/ghc/9.4.1-rc1/ghc-${version}-src.tar.xz";185- sha256 = "bca8c52f76d8747a66291181de2de7bdf9ff80093808fe39bf5cbff0f116c426";186 };187188 enableParallelBuilding = true;189190 outputs = [ "out" "doc" ];1910192 patches = [193- # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482194 (fetchpatch {195- url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";196- sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";197- extraPrefix = "utils/haddock/";198- stripLen = 1;199 })200- # fix race condition in make build system201- (fetchpatch {202- name = "ghc-hs-boot-copying-fix.patch";203- url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4f17eff0cbd125eca55b68f4927befdd45008eb6.diff";204- sha256 = "0anq3w9z9mhxb0wx6rvxac3n7rl3apcma9zk3r9zz9hj9v7vkqzx";205- })206 ];207208 postPatch = "patchShebangs .";···235 '' + ''236237 echo -n "${buildMK}" > mk/build.mk238- # GHC 9.4.1-rc1 tarball is not properly prepared, also the boot script has been renamed239- # https://gitlab.haskell.org/ghc/ghc/-/issues/21626#note_444654240- # TODO(@sternenseemann): make source-dist rules include all boot-generated files241- ./boot.source242-243- # Too restrictive upper bound on Cabal the make build system chokes on244- # XXX(@sternenseemann): this should be upstreamed245- substituteInPlace utils/ghc-cabal/ghc-cabal.cabal --replace "3.8" "3.9"246247 sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure248 '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''···264 --replace '*-android*|*-gnueabi*)' \265 '*-android*|*-gnueabi*|*-musleabi*)'266 done0000000267 '';268269 # TODO(@Ericson2314): Always pass "--target" and always prefix.
···177assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;178179stdenv.mkDerivation (rec {180+ version = "9.4.1";181 pname = "${targetPrefix}ghc${variantSuffix}";182183 src = fetchurl {184+ url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";185+ sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM=";186 };187188 enableParallelBuilding = true;189190 outputs = [ "out" "doc" ];191192+193 patches = [194+ # add missing profiling targets in make build system195 (fetchpatch {196+ name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch";197+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff";198+ sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU=";0199 })200+ ./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch00000201 ];202203 postPatch = "patchShebangs .";···240 '' + ''241242 echo -n "${buildMK}" > mk/build.mk00000000243244 sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure245 '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''···277 --replace '*-android*|*-gnueabi*)' \278 '*-android*|*-gnueabi*|*-musleabi*)'279 done280+ ''281+ # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have282+ # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian.283+ + ''284+ substituteInPlace configure --replace \285+ 'MinBootGhcVersion="9.0"' \286+ 'MinBootGhcVersion="8.10"'287 '';288289 # TODO(@Ericson2314): Always pass "--target" and always prefix.
···1+diff --git a/django/conf/__init__.py b/django/conf/__init__.py2+index cb70a71791..5156f7dd73 1006443+--- a/django/conf/__init__.py4++++ b/django/conf/__init__.py5+@@ -227,7 +227,7 @@ class Settings:6+ if hasattr(time, "tzset") and self.TIME_ZONE:7+ # When we can, attempt to validate the timezone. If we can't find8+ # this file, no check happens and it's harmless.9+- zoneinfo_root = Path("/usr/share/zoneinfo")10++ zoneinfo_root = Path("@zoneinfo@")11+ zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/"))12+ if zoneinfo_root.exists() and not zone_info_file.exists():13+ raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
···24 fi25 done26 '';27+ meta = {28+ # ihaskell has an indirect dependency on the Python package mistune, which29+ # is marked insecure.30+ hydraPlatforms = lib.platforms.none;31+ };32}
+3-3
pkgs/development/tools/kdash/default.nix
···1213rustPlatform.buildRustPackage rec {14 pname = "kdash";15- version = "0.3.3";1617 src = fetchFromGitHub {18 owner = "kdash-rs";19 repo = pname;20 rev = "v${version}";21- sha256 = "sha256-u5Qa1rStWeFku3VA2ljg+RQxh12byfyBHXC+NQJTr0w=";22 };2324 nativeBuildInputs = [ perl python3 pkg-config ];···26 buildInputs = [ openssl xorg.xcbutil ]27 ++ lib.optional stdenv.isDarwin AppKit;2829- cargoSha256 = "sha256-rSPe7kkeHEYDqF80oO+Z+bGkWewtjnKut13EP6tmUIc=";3031 meta = with lib; {32 description = "A simple and fast dashboard for Kubernetes";
···1213rustPlatform.buildRustPackage rec {14 pname = "kdash";15+ version = "0.3.4";1617 src = fetchFromGitHub {18 owner = "kdash-rs";19 repo = pname;20 rev = "v${version}";21+ sha256 = "sha256-xKrgRUU0ENJ8CIQUaU/6dMbmxN9RX4jksQnBfgcsRYE=";22 };2324 nativeBuildInputs = [ perl python3 pkg-config ];···26 buildInputs = [ openssl xorg.xcbutil ]27 ++ lib.optional stdenv.isDarwin AppKit;2829+ cargoSha256 = "sha256-7RQvd9zx6iXKmgYLp8N8hGDfq9IX0LoNf2jXwv+iOkM=";3031 meta = with lib; {32 description = "A simple and fast dashboard for Kubernetes";
···1+{ lib2+, rustPlatform3+, fetchFromGitHub4+, pkg-config5+, glibc6+, libsoup7+, cairo8+, gtk39+, webkitgtk10+}:11+12+rustPlatform.buildRustPackage rec {13+ pname = "tauri";14+ version = "1.0.5";15+16+ src = fetchFromGitHub {17+ owner = "tauri-apps";18+ repo = pname;19+ rev = "v${version}";20+ sha256 = "sha256-mp9U46H03NTMumUkx5kjsh9LnbPBrvlhh3yCH6FYdbE=";21+ };22+23+ # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at24+ # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/1020225+ sourceRoot = "source/tooling/cli";26+27+ cargoSha256 = "sha256-iFXuVrxE/QmM+TAZmN8Ivt6Le19NWYIfVn1PNPvmhZo=";28+29+ buildInputs = [ glibc libsoup cairo gtk3 webkitgtk ];30+ nativeBuildInputs = [ pkg-config ];31+32+ meta = with lib; {33+ description = "Build smaller, faster, and more secure desktop applications with a web frontend";34+ homepage = "https://tauri.app/";35+ license = with licenses; [ asl20 /* or */ mit ];36+ maintainers = with maintainers; [ dit7ya ];37+ };38+}
+3
pkgs/games/hedgewars/default.nix
···107 all movement on the battlefield has ceased).'';108 maintainers = with maintainers; [ kragniz fpletz ];109 inherit (fpc.meta) platforms;000110 };111}
···107 all movement on the battlefield has ceased).'';108 maintainers = with maintainers; [ kragniz fpletz ];109 inherit (fpc.meta) platforms;110+ # https://github.com/NixOS/nixpkgs/pull/185755#issuecomment-1219024584111+ broken = true;112+ hydraPlatforms = platforms.none;113 };114}
···157 };158 ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix {159 bootPkgs =160- # TODO(@sternenseemann): Package 9.0.2 bindist or wait for upstream fix161- # Need to use 902 due to162 # https://gitlab.haskell.org/ghc/ghc/-/issues/21914163- packages.ghc902;0000000000164 inherit (buildPackages.python3Packages) sphinx;165 # Need to use apple's patched xattr until166 # https://github.com/xattr/xattr/issues/44 and
···157 };158 ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix {159 bootPkgs =160+ # Building with 9.2 is broken due to0161 # https://gitlab.haskell.org/ghc/ghc/-/issues/21914162+ # Use 8.10 as a workaround where possible to keep bootstrap path short.163+164+ # On ARM text won't build with GHC 8.10.*165+ if stdenv.hostPlatform.isAarch then166+ # TODO(@sternenseemann): package bindist167+ packages.ghc902168+ # No suitable bindists for powerpc64le169+ else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then170+ packages.ghc902171+ else172+ packages.ghc8107Binary;173 inherit (buildPackages.python3Packages) sphinx;174 # Need to use apple's patched xattr until175 # https://github.com/xattr/xattr/issues/44 and