b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #103960 from gnidorah/my

Browse source
This commit is contained in:
Doron Behar 2020-11-16 19:15:56 +02:00 committed by GitHub
parent a9a1423377 c2acc89018
commit b23ac198b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/openmpt123/default.nix
View file

@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let
version = "0.5.2";
version = "0.5.3";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "1cwpc4j90dpxa2siia68rg9qwwm2xk6bhxnslfjj364507jy6s4l";
sha256 = "1f155yf5v57dwhzb7z0kh67lckr3yq4x8040dm54qgbxw582la77";
};
enableParallelBuilding = true;

16
pkgs/applications/graphics/lazpaint/default.nix
View file

@ -7,24 +7,24 @@ let
bgrabitmap = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgrabitmap";
rev = "v11.2.4";
sha256 = "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md";
rev = "v11.2.5";
sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1";
};
bgracontrols = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgracontrols";
rev = "v6.9";
sha256 = "0hwjlqlwqs4fqxlgay84hccs1lm3c6i9nmq9sxzrip410mggnjyw";
rev = "v7.0";
sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy";
};
in stdenv.mkDerivation rec {
pname = "lazpaint";
version = "7.1.4";
version = "7.1.5";
src = fetchFromGitHub {
owner = "bgrabitmap";
repo = "lazpaint";
rev = "v${version}";
sha256 = "19b0wrjjyvz3g2d2gdsz8ihc1clda5v22yb597an8j9sblp9m0nf";
sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5";
};
nativeBuildInputs = [ lazarus fpc makeWrapper ];
@ -56,10 +56,6 @@ in stdenv.mkDerivation rec {
# Python is needed for scripts
makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \
--prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]}
substituteInPlace $out/share/applications/lazpaint.desktop \
--replace /usr/share/pixmaps/lazpaint.png $out/share/pixmaps/lazpaint.png \
--replace /usr/share/lazpaint/lazpaint $out/bin/lazpaint
'';
meta = with stdenv.lib; {

13
pkgs/development/compilers/pakcs/default.nix
View file

@ -4,13 +4,14 @@
, curl, git, unzip, gnutar, coreutils, sqlite }:
let
name = "pakcs-2.2.0";
pname = "pakcs";
version = "2.2.1";
# Don't switch to development release without a reason, because its
# source updates without version bump. Prefer current release instead.
# Don't switch to "Current release" without a reason, because its
# source updates without version bump. Prefer last from "Older releases" instead.
src = fetchurl {
url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz";
sha256 = "0c0a6cp9lwha5i90kv9ya2zi1ggnvkf4gwjfzbffgwwa77s2wz2l";
url = "https://www.informatik.uni-kiel.de/~pakcs/download/pakcs-${version}-src.tar.gz";
sha256 = "1jyg29j8r8pgcin7ixdya6c3zzfjdi66rghpwrfnkk133fz4iz7s";
};
curry-frontend = (haskellPackages.override {
@ -26,7 +27,7 @@ let
};
}).curry-frontend;
in stdenv.mkDerivation {
inherit name src;
inherit pname version src;
buildInputs = [ swiProlog ];
nativeBuildInputs = [ which makeWrapper ];