Loading maintainers/maintainer-list.nix +10 −0 Original line number Diff line number Diff line Loading @@ -11044,6 +11044,16 @@ githubId = 34162313; name = "Jason Wing"; }; netfox = { name = "netfox"; email = "say-hi@netfox.rip"; matrix = "@netfox:catgirl.cloud"; github = "0xnetfox"; githubId = 97521402; keys = [{ fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7"; }]; }; netixx = { email = "dev.espinetfrancois@gmail.com"; github = "netixx"; Loading pkgs/applications/audio/qmmp/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; version = "2.1.2"; version = "2.1.3"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; hash = "sha256-U86LoAkg6mBFVa/cgB8kpCa5KwdkR0PMQmAGvf/KAXo="; hash = "sha256-+bHnvwXUmdBbQcO3Unybqou/MZgcf6CXhlAcBjNFCNQ="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; Loading pkgs/applications/audio/tauon/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tauon"; version = "7.6.3"; version = "7.6.4"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; hash = "sha256-cNR4Ffn9HvgL5KV4FUSnbzEh6VfoKaIbfpb18/qKEns="; hash = "sha256-xMUQ2LabxuvCdd7dsoXPN3tjkDxfXIQ8UrJcsGQ+EEU="; }; postUnpack = '' Loading pkgs/applications/blockchains/solana/default.nix +78 −29 Original line number Diff line number Diff line Loading @@ -2,22 +2,54 @@ , fetchFromGitHub , lib , rustPlatform , IOKit , Security , AppKit , pkg-config , darwin , udev , zlib , protobuf , libcxx , rocksdb , pkg-config , openssl , nix-update-script # Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84 , solanaPkgs ? [ "solana" "solana-bench-tps" "solana-faucet" "solana-gossip" "solana-install" "solana-keygen" "solana-log-analyzer" "solana-net-shaper" "solana-sys-tuner" "rbpf-cli" "solana-validator" "solana-ledger-tool" "cargo-build-bpf" "cargo-test-bpf" "solana-dos" "solana-install-init" "solana-stake-accounts" "solana-test-validator" "solana-tokens" "solana-watchtower" "cargo-test-sbf" "cargo-build-sbf" ] ++ [ # XXX: Ensure `solana-genesis` is built LAST! # See https://github.com/solana-labs/solana/issues/5826 "solana-genesis" ] }: let pinData = lib.importJSON ./pin.json; version = pinData.version; sha256 = pinData.sha256; cargoSha256 = pinData.cargoSha256; version = "1.14.17"; sha256 = "sha256-pYbnEF8MgF7fCBf/MOPT//UCeOQj9tuIkDj8UIVFz3E="; cargoSha256 = "sha256-n9nuBiKV3FCgq5fJ5BuqIIAp1yZ6IO+zHjrMaUBfgzs="; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security; in rustPlatform.buildRustPackage rec { pname = "solana-testnet-cli"; pname = "solana-cli"; inherit version cargoSha256; src = fetchFromGitHub { Loading @@ -27,35 +59,52 @@ rustPlatform.buildRustPackage rec { inherit sha256; }; buildAndTestSubdir = "cli"; strictDeps = true; verifyCargoDeps = true; cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs; nativeBuildInputs = lib.optionals stdenv.isLinux [ protobuf pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ udev zlib ] ++ lib.optionals stdenv.isDarwin [ IOKit Security AppKit ]; # check phase fails # on darwin with missing framework System. This framework is not available in nixpkgs # on linux with some librocksdb-sys compilation error # Even tho the tests work, a shit ton of them try to connect to a local RPC # or access internet in other ways, eventually failing due to Nix sandbox. # Maybe we could restrict the check to the tests that don't require an RPC, # but judging by the quantity of tests, that seems like a lengthty work and # I'm not in the mood ((ΦωΦ)) doCheck = false; # all the following are needed for the checkphase # nativeCheckInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ]; # Needed to get openssl-sys to use pkg-config. # OPENSSL_NO_VENDOR = 1; # OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; # OPENSSL_DIR="${lib.getDev openssl}"; # LLVM_CONFIG_PATH="${llvm}/bin/llvm-config"; # LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; nativeBuildInputs = [ protobuf pkg-config ]; buildInputs = [ openssl rustPlatform.bindgenHook ] ++ lib.optionals stdenv.isLinux [ udev ] ++ lib.optionals stdenv.isDarwin [ libcxx IOKit Security AppKit System Libsystem ]; postInstall = '' mkdir -p $out/bin/sdk/bpf cp -a ./sdk/bpf/* $out/bin/sdk/bpf/ ''; # Used by build.rs in the rocksdb-sys crate. If we don't set these, it would # try to build RocksDB from source. # ROCKSDB_INCLUDE_DIR="${rocksdb}/include"; # ROCKSDB_LIB_DIR="${rocksdb}/lib"; ROCKSDB_LIB_DIR="${rocksdb}/lib"; # Require this on darwin otherwise the compiler starts rambling about missing # cmath functions CPPFLAGS=lib.optionals stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; LDFLAGS=lib.optionals stdenv.isDarwin "-L${lib.getLib libcxx}/lib"; # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; meta = with lib; { description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. "; homepage = "https://solana.com"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; maintainers = with maintainers; [ netfox happysalada ]; platforms = platforms.unix; }; passthru.updateScript = ./update.sh; passthru.updateScript = nix-update-script { }; } pkgs/applications/blockchains/solana/pin.jsondeleted 100644 → 0 +0 −5 Original line number Diff line number Diff line { "version": "1.10.9", "sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=", "cargoSha256": "sha256-7EULmmztt+INvSdluvvX5xbE2hWKAmHiW0MEYIPNPw4=" } Loading
maintainers/maintainer-list.nix +10 −0 Original line number Diff line number Diff line Loading @@ -11044,6 +11044,16 @@ githubId = 34162313; name = "Jason Wing"; }; netfox = { name = "netfox"; email = "say-hi@netfox.rip"; matrix = "@netfox:catgirl.cloud"; github = "0xnetfox"; githubId = 97521402; keys = [{ fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7"; }]; }; netixx = { email = "dev.espinetfrancois@gmail.com"; github = "netixx"; Loading
pkgs/applications/audio/qmmp/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; version = "2.1.2"; version = "2.1.3"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; hash = "sha256-U86LoAkg6mBFVa/cgB8kpCa5KwdkR0PMQmAGvf/KAXo="; hash = "sha256-+bHnvwXUmdBbQcO3Unybqou/MZgcf6CXhlAcBjNFCNQ="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; Loading
pkgs/applications/audio/tauon/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tauon"; version = "7.6.3"; version = "7.6.4"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; hash = "sha256-cNR4Ffn9HvgL5KV4FUSnbzEh6VfoKaIbfpb18/qKEns="; hash = "sha256-xMUQ2LabxuvCdd7dsoXPN3tjkDxfXIQ8UrJcsGQ+EEU="; }; postUnpack = '' Loading
pkgs/applications/blockchains/solana/default.nix +78 −29 Original line number Diff line number Diff line Loading @@ -2,22 +2,54 @@ , fetchFromGitHub , lib , rustPlatform , IOKit , Security , AppKit , pkg-config , darwin , udev , zlib , protobuf , libcxx , rocksdb , pkg-config , openssl , nix-update-script # Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84 , solanaPkgs ? [ "solana" "solana-bench-tps" "solana-faucet" "solana-gossip" "solana-install" "solana-keygen" "solana-log-analyzer" "solana-net-shaper" "solana-sys-tuner" "rbpf-cli" "solana-validator" "solana-ledger-tool" "cargo-build-bpf" "cargo-test-bpf" "solana-dos" "solana-install-init" "solana-stake-accounts" "solana-test-validator" "solana-tokens" "solana-watchtower" "cargo-test-sbf" "cargo-build-sbf" ] ++ [ # XXX: Ensure `solana-genesis` is built LAST! # See https://github.com/solana-labs/solana/issues/5826 "solana-genesis" ] }: let pinData = lib.importJSON ./pin.json; version = pinData.version; sha256 = pinData.sha256; cargoSha256 = pinData.cargoSha256; version = "1.14.17"; sha256 = "sha256-pYbnEF8MgF7fCBf/MOPT//UCeOQj9tuIkDj8UIVFz3E="; cargoSha256 = "sha256-n9nuBiKV3FCgq5fJ5BuqIIAp1yZ6IO+zHjrMaUBfgzs="; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security; in rustPlatform.buildRustPackage rec { pname = "solana-testnet-cli"; pname = "solana-cli"; inherit version cargoSha256; src = fetchFromGitHub { Loading @@ -27,35 +59,52 @@ rustPlatform.buildRustPackage rec { inherit sha256; }; buildAndTestSubdir = "cli"; strictDeps = true; verifyCargoDeps = true; cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs; nativeBuildInputs = lib.optionals stdenv.isLinux [ protobuf pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ udev zlib ] ++ lib.optionals stdenv.isDarwin [ IOKit Security AppKit ]; # check phase fails # on darwin with missing framework System. This framework is not available in nixpkgs # on linux with some librocksdb-sys compilation error # Even tho the tests work, a shit ton of them try to connect to a local RPC # or access internet in other ways, eventually failing due to Nix sandbox. # Maybe we could restrict the check to the tests that don't require an RPC, # but judging by the quantity of tests, that seems like a lengthty work and # I'm not in the mood ((ΦωΦ)) doCheck = false; # all the following are needed for the checkphase # nativeCheckInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ]; # Needed to get openssl-sys to use pkg-config. # OPENSSL_NO_VENDOR = 1; # OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; # OPENSSL_DIR="${lib.getDev openssl}"; # LLVM_CONFIG_PATH="${llvm}/bin/llvm-config"; # LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; nativeBuildInputs = [ protobuf pkg-config ]; buildInputs = [ openssl rustPlatform.bindgenHook ] ++ lib.optionals stdenv.isLinux [ udev ] ++ lib.optionals stdenv.isDarwin [ libcxx IOKit Security AppKit System Libsystem ]; postInstall = '' mkdir -p $out/bin/sdk/bpf cp -a ./sdk/bpf/* $out/bin/sdk/bpf/ ''; # Used by build.rs in the rocksdb-sys crate. If we don't set these, it would # try to build RocksDB from source. # ROCKSDB_INCLUDE_DIR="${rocksdb}/include"; # ROCKSDB_LIB_DIR="${rocksdb}/lib"; ROCKSDB_LIB_DIR="${rocksdb}/lib"; # Require this on darwin otherwise the compiler starts rambling about missing # cmath functions CPPFLAGS=lib.optionals stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; LDFLAGS=lib.optionals stdenv.isDarwin "-L${lib.getLib libcxx}/lib"; # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; meta = with lib; { description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. "; homepage = "https://solana.com"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; maintainers = with maintainers; [ netfox happysalada ]; platforms = platforms.unix; }; passthru.updateScript = ./update.sh; passthru.updateScript = nix-update-script { }; }
pkgs/applications/blockchains/solana/pin.jsondeleted 100644 → 0 +0 −5 Original line number Diff line number Diff line { "version": "1.10.9", "sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=", "cargoSha256": "sha256-7EULmmztt+INvSdluvvX5xbE2hWKAmHiW0MEYIPNPw4=" }