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: af6dbe82b41f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f6d423470a86
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 20, 2020

  1. librepcb: touch ups, co-maintain 

    Fixes a bug where the build system tried to call `git` to embed the
release tag revision into the binary, which isn't allowed. Easily fixed
with `substituteInPlace`.

Also updates the expression to be a little closer to "standard"
expressions (e.g. consistent indentation, importing `stdenv` instead of
`lib` and `mkDerivation`, etc.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Nov 20, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    00c451a View commit details

  2. picat: 3.0p2 -> 3.0p3, co-maintain 

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Nov 20, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    f6d4234 View commit details
Showing with 34 additions and 33 deletions.
  1. +25 −17 pkgs/applications/science/electronics/librepcb/default.nix
  2. +9 −16 pkgs/development/compilers/picat/default.nix
42 changes: 25 additions & 17 deletions pkgs/applications/science/electronics/librepcb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,47 @@
{ lib, mkDerivation, fetchFromGitHub, qtbase, qttools, qmake, wrapQtAppsHook }:
{ stdenv, lib, fetchFromGitHub
, qtbase, qttools, qmake, wrapQtAppsHook
}:

mkDerivation rec {
stdenv.mkDerivation rec {
pname = "librepcb";
version = "0.1.5";

src = fetchFromGitHub {
owner = "LibrePCB";
repo = "LibrePCB";
fetchSubmodules = true;
rev = version;
owner = pname;
repo = pname;
rev = version;
sha256 = "0ag8h3id2c1k9ds22rfrvyhf2vjhkv82xnrdrz4n1hnlr9566vcx";
fetchSubmodules = true;
};

enableParallelBuilding = true;

nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];

buildInputs = [ qtbase ];

qmakeFlags = ["-r"];
enableParallelBuilding = true;

postInstall = ''
mkdir -p $out/share/librepcb/fontobene
cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
'';
mkdir -p $out/share/librepcb/fontobene
cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
'';

# the build system tries to use 'git' at build time to find the HEAD hash.
# that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment
# at the end of the line to remove the git call.
patchPhase = ''
substituteInPlace ./libs/librepcb/common/common.pro \
--replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # '
'';

preFixup = ''
wrapQtApp $out/bin/librepcb
'';

meta = with lib; {
meta = with stdenv.lib; {
description = "A free EDA software to develop printed circuit boards";
homepage = "https://librepcb.org/";
maintainers = with maintainers; [ luz ];
license = licenses.gpl3;
platforms = platforms.linux;
homepage = "https://librepcb.org/";
maintainers = with maintainers; [ luz thoughtpolice ];
license = licenses.gpl3;
platforms = platforms.linux;
};
}
25 changes: 9 additions & 16 deletions pkgs/development/compilers/picat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation {
pname = "picat";
version = "3.0p2";
version = "3.0p3";

src = fetchurl {
url = "http://picat-lang.org/download/picat30_2_src.tar.gz";
sha256 = "0sn4fqj2ryalcndx1df5kx5rzb4pfcrza5ljlg9dkfbqv02xgxkd";
url = "http://picat-lang.org/download/picat30_3_src.tar.gz";
sha256 = "052w0vk2xfmky5nv280ysb8in6vaph7i79yvbddqmahzszarq5hw";
};

buildInputs = [ zlib ];
@@ -18,25 +18,18 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
enableParallelBuilding = true;

buildPhase = ''
cd emu
make -f Makefile.$ARCH
'';
buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH";

installPhase = ''
mkdir -p $out/bin
cp picat $out/bin/picat
'';

meta = {
meta = with stdenv.lib; {
description = "Logic-based programming langage";
longDescription = ''
Picat is a simple, and yet powerful, logic-based multi-paradigm
programming language aimed for general-purpose applications.
'';
homepage = "http://picat-lang.org/";
license = stdenv.lib.licenses.mpl20;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.earldouglas ];
homepage = "http://picat-lang.org/";
license = licenses.mpl20;
platforms = platforms.linux;
maintainers = with maintainers; [ earldouglas thoughtpolice ];
};
}