-
Notifications
You must be signed in to change notification settings - Fork 352
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Problem: nixpkgs-fmt is deprecated (#1111)
* Problem: nixpkgs-fmt is deprecated Solution: - switch to nixfmt-rfc-style * fmt
- Loading branch information
Showing
16 changed files
with
398 additions
and
275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,18 @@ | ||
| { system ? "x86_64-linux", pkgs ? import ./nix { inherit system; } }: | ||
| { | ||
| system ? "x86_64-linux", | ||
| pkgs ? import ./nix { inherit system; }, | ||
| }: | ||
| let | ||
| self = import ./. { inherit pkgs; }; | ||
| in | ||
| { | ||
| chaindImage = | ||
| pkgs.dockerTools.buildLayeredImage { | ||
| name = "crypto-org-chain/chain-maind"; | ||
| config.Entrypoint = [ "${pkgs.callPackage ./. {}}/bin/chain-maind" ]; | ||
| }; | ||
| chaindImage = pkgs.dockerTools.buildLayeredImage { | ||
| name = "crypto-org-chain/chain-maind"; | ||
| config.Entrypoint = [ "${pkgs.callPackage ./. { }}/bin/chain-maind" ]; | ||
| }; | ||
|
|
||
| pystarportImage = | ||
| pkgs.dockerTools.buildLayeredImage { | ||
| name = "crypto-org-chain/chain-main-pystarport"; | ||
| config.Entrypoint = [ "${pkgs.test-env}/bin/pystarport" ]; | ||
| }; | ||
| pystarportImage = pkgs.dockerTools.buildLayeredImage { | ||
| name = "crypto-org-chain/chain-main-pystarport"; | ||
| config.Entrypoint = [ "${pkgs.test-env}/bin/pystarport" ]; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,58 @@ | ||
| let | ||
| pkgs = import ../nix { }; | ||
| released = (import (builtins.fetchTarball "https://github.com/crypto-org-chain/chain-main/archive/v1.1.0.tar.gz") { }).chain-maind; | ||
| released2 = (import (builtins.fetchTarball "https://github.com/crypto-org-chain/chain-main/archive/v2.0.1.tar.gz") { }).chain-maind; | ||
| released3 = (import (builtins.fetchTarball "https://github.com/crypto-org-chain/chain-main/archive/v3.3.4.tar.gz") { }).chain-maind; | ||
| fetchFlake = repo: rev: (pkgs.flake-compat { | ||
| src = { | ||
| outPath = builtins.fetchTarball "https://github.com/${repo}/archive/${rev}.tar.gz"; | ||
| inherit rev; | ||
| shortRev = builtins.substring 0 7 rev; | ||
| }; | ||
| }).defaultNix; | ||
| released4_2 = (fetchFlake "crypto-org-chain/chain-main" "b3226f06fd2a236f9957304c4d83b0ea06ed2604").default; | ||
| released4_3 = (fetchFlake "crypto-org-chain/chain-main" "7598bc46226a1b58116da2e6bd3903aca5b5313b").default; | ||
| released = | ||
| (import | ||
| (builtins.fetchTarball "https://github.com/crypto-org-chain/chain-main/archive/v1.1.0.tar.gz") | ||
| { } | ||
| ).chain-maind; | ||
| released2 = | ||
| (import | ||
| (builtins.fetchTarball "https://github.com/crypto-org-chain/chain-main/archive/v2.0.1.tar.gz") | ||
| { } | ||
| ).chain-maind; | ||
| released3 = | ||
| (import | ||
| (builtins.fetchTarball "https://github.com/crypto-org-chain/chain-main/archive/v3.3.4.tar.gz") | ||
| { } | ||
| ).chain-maind; | ||
| fetchFlake = | ||
| repo: rev: | ||
| (pkgs.flake-compat { | ||
| src = { | ||
| outPath = builtins.fetchTarball "https://github.com/${repo}/archive/${rev}.tar.gz"; | ||
| inherit rev; | ||
| shortRev = builtins.substring 0 7 rev; | ||
| }; | ||
| }).defaultNix; | ||
| released4_2 = | ||
| (fetchFlake "crypto-org-chain/chain-main" "b3226f06fd2a236f9957304c4d83b0ea06ed2604").default; | ||
| released4_3 = | ||
| (fetchFlake "crypto-org-chain/chain-main" "7598bc46226a1b58116da2e6bd3903aca5b5313b").default; | ||
| current = pkgs.callPackage ../. { }; | ||
| in | ||
| pkgs.linkFarm "upgrade-test-package" [ | ||
| { name = "genesis"; path = released; } | ||
| { name = "v2.0.0"; path = released2; } | ||
| { name = "v3.0.0"; path = released3; } | ||
| { name = "v4.2.0"; path = released4_2; } | ||
| { name = "v4.3.0"; path = released4_3; } | ||
| { name = "v5.0"; path = current; } | ||
| { | ||
| name = "genesis"; | ||
| path = released; | ||
| } | ||
| { | ||
| name = "v2.0.0"; | ||
| path = released2; | ||
| } | ||
| { | ||
| name = "v3.0.0"; | ||
| path = released3; | ||
| } | ||
| { | ||
| name = "v4.2.0"; | ||
| path = released4_2; | ||
| } | ||
| { | ||
| name = "v4.3.0"; | ||
| path = released4_3; | ||
| } | ||
| { | ||
| name = "v5.0"; | ||
| path = current; | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,37 @@ | ||
| { runCommand | ||
| , windows | ||
| , stdenv | ||
| , rocksdb | ||
| , bzip2 | ||
| , lz4 | ||
| , snappy | ||
| , zstd | ||
| , zlib | ||
| , chain-maind | ||
| { | ||
| runCommand, | ||
| windows, | ||
| stdenv, | ||
| rocksdb, | ||
| bzip2, | ||
| lz4, | ||
| snappy, | ||
| zstd, | ||
| zlib, | ||
| chain-maind, | ||
| }: | ||
| runCommand "tarball-${chain-maind.name}" | ||
| { | ||
| # manually enumerate the runtime dependencies of chain-maind on mingwW64 | ||
| deps = [ | ||
| "${rocksdb}/bin/librocksdb-shared.dll" | ||
| "${snappy}/bin/libsnappy.dll" | ||
| "${lz4.out}/lib/liblz4.dll" | ||
| "${bzip2.bin}/bin/libbz2-1.dll" | ||
| "${zlib}/bin/zlib1.dll" | ||
| "${zstd.bin}/bin/libzstd.dll" | ||
| "${windows.mingw_w64_pthreads}/bin/libwinpthread-1.dll" | ||
| "${windows.mcfgthreads}/bin/libmcfgthread-1.dll" | ||
| "${stdenv.cc.cc.lib}/x86_64-w64-mingw32/lib/libgcc_s_seh-1.dll" | ||
| "${stdenv.cc.cc.lib}/x86_64-w64-mingw32/lib/libstdc++-6.dll" | ||
| ]; | ||
| } '' | ||
| mkdir -p $out | ||
| for so in $deps | ||
| do | ||
| cp $so $out/ | ||
| done | ||
| { | ||
| # manually enumerate the runtime dependencies of chain-maind on mingwW64 | ||
| deps = [ | ||
| "${rocksdb}/bin/librocksdb-shared.dll" | ||
| "${snappy}/bin/libsnappy.dll" | ||
| "${lz4.out}/lib/liblz4.dll" | ||
| "${bzip2.bin}/bin/libbz2-1.dll" | ||
| "${zlib}/bin/zlib1.dll" | ||
| "${zstd.bin}/bin/libzstd.dll" | ||
| "${windows.mingw_w64_pthreads}/bin/libwinpthread-1.dll" | ||
| "${windows.mcfgthreads}/bin/libmcfgthread-1.dll" | ||
| "${stdenv.cc.cc.lib}/x86_64-w64-mingw32/lib/libgcc_s_seh-1.dll" | ||
| "${stdenv.cc.cc.lib}/x86_64-w64-mingw32/lib/libstdc++-6.dll" | ||
| ]; | ||
| } | ||
| '' | ||
| mkdir -p $out | ||
| for so in $deps | ||
| do | ||
| cp $so $out/ | ||
| done | ||
| cp ${chain-maind}/bin/${chain-maind.meta.mainProgram} $out/ | ||
| '' | ||
| cp ${chain-maind}/bin/${chain-maind.meta.mainProgram} $out/ | ||
| '' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.