Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 269591417557
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a2f854b6eeba
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 21, 2019

  1. xzoom: fix version

    davidak committed Oct 21, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    49945b9 View commit details
  2. Merge pull request #71528 from davidak/xzoom

    xzoom: fix version
    7c6f434c authored Oct 21, 2019
    Copy the full SHA
    a2f854b View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/tools/X11/xzoom/default.nix
12 changes: 7 additions & 5 deletions pkgs/tools/X11/xzoom/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
{ stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}:

stdenv.mkDerivation rec {
name = "${pname}-${version}.${patchlevel}";
name = "${pname}-${version}";
pname = "xzoom";
version = "0.3";
patchlevel = "24";
major = "0";
minor = "3";
patch = "24";
version = "${major}.${minor}.${patch}";

# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
url = "http://www.ibiblio.org/pub/linux/libs/X/${pname}-${version}.tgz";
url = "http://www.ibiblio.org/pub/linux/libs/X/${pname}-${major}.${minor}.tgz";
sha256 = "0jzl5py4ny4n4i58lxx2hdwq9zphqf7h3m14spl3079y5mlzssxj";
};
patches = [
(fetchurl {
url = "http://http.debian.net/debian/pool/main/x/xzoom/xzoom_${version}-${patchlevel}.diff.gz";
url = "http://http.debian.net/debian/pool/main/x/xzoom/xzoom_${major}.${minor}-${patch}.diff.gz";
sha256 = "0zhc06whbvaz987bzzzi2bz6h9jp6rv812qs7b71drivvd820qbh";
})
];