Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2bcc9260e4cf
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b5f5c97f7d67
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Jul 24, 2019

  1. cargo-generate: init at 0.3.0

    @turboMaCk
    turboMaCk committed Jul 24, 2019
    Copy the full SHA
    02d79ce View commit details

  2. klystrack: init at 1.7.6

    @suhr
    suhr committed Jul 24, 2019
    Copy the full SHA
    88f163e View commit details

  3. Merge pull request #65236 from suhr/klystrack 

    klystrack: init at 1.7.6
    @worldofpeace
    worldofpeace authored Jul 24, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    90ccc1c View commit details

  4. Merge pull request #64245 from turboMaCk/tools-rust/cargo-generate 

    cargo-generate: init at 0.3.0
    @marsam
    marsam authored Jul 24, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b5f5c97 View commit details
Showing with 87 additions and 0 deletions.
  1. +52 −0 pkgs/applications/audio/klystrack/default.nix
  2. +30 −0 pkgs/development/tools/rust/cargo-generate/default.nix
  3. +5 −0 pkgs/top-level/all-packages.nix
52 changes: 52 additions & 0 deletions pkgs/applications/audio/klystrack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{ stdenv, fetchFromGitHub, fetchpatch
, SDL2, SDL2_image
, pkgconfig
}:

stdenv.mkDerivation rec {
pname = "klystrack";
version = "1.7.6";

src = fetchFromGitHub {
owner = "kometbomb";
repo = pname;
rev = version;
fetchSubmodules = true;
sha256 = "1h99sm2ddaq483hhk2s3z4bjbgn0d2h7qna7l7qq98wvhqix8iyz";
};

buildInputs = [
SDL2 SDL2_image
];
nativeBuildInputs = [ pkgconfig ];

patches = [
(fetchpatch {
url = "https://github.com/kometbomb/klystrack/commit/bb537595d02140176831c4a1b8e9121978b32d22.patch";
sha256 = "06gl9q0jwg039kpxb13lg9x0k59s11968qn4lybgkadvzmhxkgmi";
})
];

buildFlags = [ "PREFIX=${placeholder "out"}" "CFG=release" ];

installPhase = ''
install -Dm755 bin.release/klystrack $out/bin/klystrack
mkdir -p $out/lib/klystrack
cp -R res $out/lib/klystrack
cp -R key $out/lib/klystrack
install -DT icon/256x256.png $out/share/icons/hicolor/256x256/apps/klystrack.png
mkdir -p $out/share/applications
substitute linux/klystrack.desktop $out/share/applications/klystrack.desktop \
--replace "klystrack %f" "$out/bin/klystrack %f"
'';

meta = with stdenv.lib; {
description = "A chiptune tracker";
homepage = "https://kometbomb.github.io/klystrack";
license = licenses.mit;
maintainers = with maintainers; [ suhr ];
platforms = platforms.linux;
};
}
30 changes: 30 additions & 0 deletions pkgs/development/tools/rust/cargo-generate/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }:

rustPlatform.buildRustPackage rec {
name = "cargo-generate-${version}";
version = "0.3.0";

src = fetchFromGitHub {
owner = "ashleygwilliams";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "0n6na6xq4bvs9hc7vc86qqmlrkv824qdmja27b21l2wz3l77r4jb";
};

cargoSha256 = "00fgzh1s63rr1vs3ahra604m81fc4imx3s09brw2y0n46syhwypi";

nativeBuildInputs = [ pkgconfig ];

buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];

doCheck = false;

meta = with stdenv.lib; {
description = "cargo, make me a project";
homepage = https://github.com/ashleygwilliams/cargo-generate;
license = licenses.asl20;
maintainers = [ maintainers.turbomack ];
platforms = platforms.all;
};
}
5 changes: 5 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4060,6 +4060,8 @@ in

klick = callPackage ../applications/audio/klick { };

klystrack = callPackage ../applications/audio/klystrack { };

knockknock = callPackage ../tools/security/knockknock { };

kore = callPackage ../development/web/kore { };
@@ -8137,6 +8139,9 @@ in
};
cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
cargo-generate = callPackage ../development/tools/rust/cargo-generate {
inherit (darwin.apple_sdk.frameworks) Security;
};

pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { };
rainicorn = callPackage ../development/tools/rust/rainicorn { };