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: 98c9ae41de70
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: 5b55f257b58d
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Jul 18, 2020

  1. fedora-coreos-config-transpiler: use upstream vendor

    @zowoq
    zowoq committed Jul 18, 2020
    Copy the full SHA
    5bb8654 View commit details

  2. gama: init at 2.09

    @lsix
    lsix committed Jul 18, 2020
    Copy the full SHA
    9eccd64 View commit details

Commits on Jul 19, 2020

  1. Merge pull request #93406 from lsix/add-gnu-gama 

    gama: init at 2.09
    @danieldk
    danieldk authored Jul 19, 2020
    Copy the full SHA
    dee4bef View commit details

  2. Merge pull request #93392 from zowoq/fcct 

    fedora-coreos-config-transpiler: use upstream vendor
    @danieldk
    danieldk authored Jul 19, 2020
    Copy the full SHA
    5b55f25 View commit details
24 changes: 24 additions & 0 deletions pkgs/applications/science/geometry/gama/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo }:
stdenv.mkDerivation rec {
pname = "gama";
version = "2.09";

src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "0c1b28frl6109arj09v4zr1xs859krn8871mkvis517g5pb55dc9";
};

buildInputs = [ expat ];

nativeBuildInputs = [ texinfo ];

checkInputs = [ octave libxml2 ];
doCheck = true;

meta = with lib ; {
description = "Tools for adjustment of geodetic networks";
homepage = "https://www.gnu.org/software/gama/";
license = licenses.gpl3Plus;
platforms = platforms.all;
};
}
4 changes: 1 addition & 3 deletions pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,7 @@ buildGoModule rec {
sha256 = "18hmnip1s0smp58q500p8dfbrmi4i3nsyq22ri5cs53wbvz3ih1l";
};

deleteVendor = true;
vendorSha256 = "0qqkaskmyxgwv9qg3y5lckqf6nchn3bxp69fyqdbvki65p445608";
vendorSha256 = null;

subPackages = [ "internal" ];

@@ -34,4 +33,3 @@ buildGoModule rec {
platforms = platforms.unix;
};
}

2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -990,6 +990,8 @@ in

gaia = callPackage ../development/libraries/gaia { };

gama = callPackage ../applications/science/geometry/gama { };

gamecube-tools = callPackage ../development/tools/gamecube-tools { };

gammy = qt5.callPackage ../tools/misc/gammy { };