diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/build-managers')
9 files changed, 61 insertions, 35 deletions
diff --git a/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix b/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix index 505f22c225bc..8cff324d9d91 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-eE3RNLK5xKOjXeA+vDQmM1hvw92TbmPEDLdeqimgwcA="; + hash = "sha256-WPMxewswSRc1ULBgGTrdZmWeFDWVzHk2jzqGChkRYKE="; }; cargoRoot = "generator"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-j9tsRho/gWCGwXUYZSbs3rudT6nYHh0FSfBCAemZHmw="; + hash = "sha256-R09sgCjwqc22zXg1T7iMx9qmyMz9xlnEuOelPB4O7jw="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix b/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix index 4214bb822b99..bb72e4bb20b4 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchgit, darwin, writeText , ninja, python3 +, disable-warnings-if-gcc13 , ... }: @@ -17,7 +18,7 @@ let #endif // OUT_LAST_COMMIT_POSITION_H_ ''; -in stdenv.mkDerivation { +in disable-warnings-if-gcc13 (stdenv.mkDerivation { pname = "gn-unstable"; inherit version; @@ -57,4 +58,4 @@ in stdenv.mkDerivation { platforms = platforms.unix; maintainers = with maintainers; [ stesie matthewbauer primeos ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix b/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix index 14f4fa806f0c..30f3c14c9d40 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.18.5"; + version = "1.19.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-NZiFxcEdNdqR38VDJe4lC5maLTguk3+t78yG1zqXuA0="; + hash = "sha256-BjSe5N9rFsVL5EueCbBTcnIJM4TYd5q/1wrsANCyniU="; }; - cargoHash = "sha256-BecaYeQYYoP7SubTktYqOejFyCTRolmUTV7rpGwXOGI="; + cargoHash = "sha256-tMqk0aI+ObxlgAOa1inL8mba9ti9Gxhg9mckmyNsuv8="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock b/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock index a8c82c508bd9..5082e8b0c44c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/build-managers/rake/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - rake (13.0.6) + rake (13.1.0) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES rake BUNDLED WITH - 2.4.6 + 2.5.3 diff --git a/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix index b389469840d0..e384c801699c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rake/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; type = "gem"; }; - version = "13.0.6"; + version = "13.1.0"; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json b/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json index cc342b1feb74..20718c2c909f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.1.0", + "version": "1.1.1", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1w8vxfyn1h5x5jxh4w133w0l566ly3chhkff06jy1gik4hszd97y" + "sha256": "1sxfwdgqzhxxhgj0kid10iay4sqq9ajndnncxl7jhh2ib59bavj2" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "0k3nsn2zzfqbkibrd5hzrsbg35x08ss4l2f7nwwa59grj5jgpm0f" + "sha256": "1z3xvyjs69iy0y59q2bwpa6blslhc1wdgwrm8xsfd0x8y0dg8kq2" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "016mdi5bp1x0r2hak4c3j26y8zrhvhsl1w7gvzsbybpbfd5p45hv" + "sha256": "05xincadr0y5kly8j058pn41wa6qmqcf6p62s45h881y3ydghxch" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0q2aqwjldsdbir8s8mix2wqkhiwb4q5d3ljf9gzxqqxgc9h4v78j" + "sha256": "0knjkkyw7libqdzw770whrbwdcyr5qabnjw7ayps0k4kql43cyns" } } } diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix index 097a8ffd519e..0bac0685b0d1 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix @@ -1,16 +1,25 @@ -{ lib, fetchurl, python3 }: +{ lib, fetchFromGitHub, python3 }: let pname = "scons"; version = "3.1.2"; - src = fetchurl { - url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; - hash = "sha256-eAHz9i9lRSjict94C+EMDpM36JdlC2Ldzunzn94T+Ps="; + src = fetchFromGitHub { + owner = "Scons"; + repo = "scons"; + rev = version; + hash = "sha256-C3U4N7+9vplzoJoevQe5Zeuz0TDmB6/miMwBJLzA3WA="; }; in python3.pkgs.buildPythonApplication { inherit pname version src; + outputs = [ "out" "man" ]; + + preConfigure = '' + python bootstrap.py + cd build/scons + ''; + setupHook = ./setup-hook.sh; doCheck = true; @@ -36,3 +45,4 @@ python3.pkgs.buildPythonApplication { maintainers = with lib.maintainers; [ AndersonTorres ]; }; } +# TODO: patch to get rid of distutils and other deprecations diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix index 65499280c2c4..f2edf5161aaf 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix @@ -1,25 +1,32 @@ -{ lib, fetchurl, python3 }: +{ lib, fetchFromGitHub, python3 }: let pname = "scons"; version = "4.1.0"; - src = fetchurl { - url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; - hash = "sha256-ctKNdi4hJnh/Fz49WeCJI5+LL06e8xFNV/ELEgaYXYU="; + src = fetchFromGitHub { + owner = "Scons"; + repo = "scons"; + rev = version; + hash = "sha256-ldus/9ghqAMB7A+NrHiCQm7saCdIpqzufGCLxWRhYKU="; }; in python3.pkgs.buildPythonApplication { inherit pname version src; + outputs = [ "out" "man" ]; + postPatch = '' substituteInPlace setup.cfg \ - --replace "build/dist" "dist" \ - --replace "build/doc/man/" "" + --replace "build/dist" "dist" + ''; + + preConfigure = '' + python scripts/scons.py ''; postInstall = '' - mkdir -p "$out/share/man/man1" - mv "$out/"*.1 "$out/share/man/man1/" + mkdir -pv "$man/share/man/man1" + mv -v "$out/"*.1 "$man/share/man/man1/" ''; setupHook = ./setup-hook.sh; diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix index 61d1719642e0..f63702cb7ef4 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix @@ -1,16 +1,20 @@ -{ lib, fetchurl, python3 }: +{ lib, fetchFromGitHub, python3 }: let pname = "scons"; version = "4.5.2"; - src = fetchurl { - url = "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz"; - hash = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; + src = fetchFromGitHub { + owner = "Scons"; + repo = "scons"; + rev = version; + hash = "sha256-vxJsz24jDsPcttwPXq9+ztc/N7W4Gkydgykk/FLgZLo="; }; in python3.pkgs.buildPythonApplication { inherit pname version src; + outputs = [ "out" "man" ]; + patches = [ ./env.patch ]; @@ -21,9 +25,13 @@ python3.pkgs.buildPythonApplication { --replace "build/doc/man/" "" ''; + preConfigure = '' + python scripts/scons.py + ''; + postInstall = '' - mkdir -p "$out/share/man/man1" - mv "$out/"*.1 "$out/share/man/man1/" + mkdir -p "$man/share/man/man1" + mv "$out/"*.1 "$man/share/man/man1/" ''; setupHook = ./setup-hook.sh; |