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: b357f9e62492
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: c5db275f8159
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 1, 2020

  1. amp: 0.6.1 -> 0.6.2 

    (cherry picked from commit 1820ce4922972cce690fbcc7e1dc3b6c239af603)
    @B4dM4n
    B4dM4n committed Mar 1, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    B4dM4n Fabian Möller
    GPG key ID: 70B29D65DD8A7E31
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f0608b0 View commit details

Commits on Mar 10, 2020

  1. Merge pull request #81463 from B4dM4n/amp-update-backport 

    [20.03] amp: 0.6.1 -> 0.6.2
    @marsam
    marsam authored Mar 10, 2020

    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
    c5db275 View commit details
Showing with 4 additions and 5 deletions.
  1. +4 −5 pkgs/applications/editors/amp/default.nix
9 changes: 4 additions & 5 deletions pkgs/applications/editors/amp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,17 +3,16 @@

rustPlatform.buildRustPackage rec {
pname = "amp";
# The latest release (0.5.2) does not compile, so we use a git snapshot instead.
version = "unstable-2019-06-09";
version = "0.6.2";

src = fetchFromGitHub {
owner = "jmacdonald";
repo = pname;
rev = "2c88e82a88ada8a5fd2620ef225192395a4533a2";
sha256 = "0ha1xiabq31s687gkrnszf3zc7b3sfdl79iyg5ygbc49mzvarp8c";
rev = version;
sha256 = "0l1vpcfq6jrq2dkrmsa4ghwdpp7c54f46gz3n7nk0i41b12hnigw";
};

cargoSha256 = "1bvj2zg19ak4vi47vjkqlybz011kn5zq1j7zznr76zrryacw4lz1";
cargoSha256 = "1rfpk3gaas1x0p2hx0cfhlpjh7yy2sw1pb4n6wly5h3vxzkmd214";

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin