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

Commits on Mar 3, 2019

  1. Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    19d817c View commit details
  2. Copy the full SHA
    20b0663 View commit details
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lfarm-client'';
version = ''lfarm-20150608-git'';

description = ''Client component of lfarm, a library for distributing work across machines.'';

deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."lparallel" args."split-sequence" args."trivial-gray-streams" args."usocket" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
};

packageName = "lfarm-client";

asdFilesToKeep = ["lfarm-client.asd"];
overrides = x: x;
}
/* (SYSTEM lfarm-client DESCRIPTION
Client component of lfarm, a library for distributing work across machines.
SHA256 1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66 URL
http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz
MD5 4cc91df44a932b3175a1eabf73d6e42d NAME lfarm-client FILENAME
lfarm-client DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-store FILENAME cl-store)
(NAME flexi-streams FILENAME flexi-streams)
(NAME lfarm-common FILENAME lfarm-common)
(NAME lparallel FILENAME lparallel)
(NAME split-sequence FILENAME split-sequence)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
(NAME usocket FILENAME usocket))
DEPENDENCIES
(alexandria bordeaux-threads cl-store flexi-streams lfarm-common lparallel
split-sequence trivial-gray-streams usocket)
VERSION lfarm-20150608-git SIBLINGS
(lfarm-admin lfarm-common lfarm-gss lfarm-launcher lfarm-server lfarm-ssl
lfarm-test)
PARASITES NIL) */
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lfarm-common'';
version = ''lfarm-20150608-git'';

description = ''(private) Common components of lfarm, a library for distributing
work across machines.'';

deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."usocket" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
};

packageName = "lfarm-common";

asdFilesToKeep = ["lfarm-common.asd"];
overrides = x: x;
}
/* (SYSTEM lfarm-common DESCRIPTION
(private) Common components of lfarm, a library for distributing
work across machines.
SHA256 1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66 URL
http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz
MD5 4cc91df44a932b3175a1eabf73d6e42d NAME lfarm-common FILENAME
lfarm-common DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-store FILENAME cl-store)
(NAME flexi-streams FILENAME flexi-streams)
(NAME split-sequence FILENAME split-sequence)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
(NAME usocket FILENAME usocket))
DEPENDENCIES
(alexandria bordeaux-threads cl-store flexi-streams split-sequence
trivial-gray-streams usocket)
VERSION lfarm-20150608-git SIBLINGS
(lfarm-admin lfarm-client lfarm-gss lfarm-launcher lfarm-server lfarm-ssl
lfarm-test)
PARASITES NIL) */
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lfarm-server'';
version = ''lfarm-20150608-git'';

description = ''Server component of lfarm, a library for distributing work across machines.'';

deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-gray-streams" args."usocket" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
};

packageName = "lfarm-server";

asdFilesToKeep = ["lfarm-server.asd"];
overrides = x: x;
}
/* (SYSTEM lfarm-server DESCRIPTION
Server component of lfarm, a library for distributing work across machines.
SHA256 1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66 URL
http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz
MD5 4cc91df44a932b3175a1eabf73d6e42d NAME lfarm-server FILENAME
lfarm-server DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-store FILENAME cl-store)
(NAME flexi-streams FILENAME flexi-streams)
(NAME lfarm-common FILENAME lfarm-common)
(NAME split-sequence FILENAME split-sequence)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
(NAME usocket FILENAME usocket))
DEPENDENCIES
(alexandria bordeaux-threads cl-store flexi-streams lfarm-common
split-sequence trivial-gray-streams usocket)
VERSION lfarm-20150608-git SIBLINGS
(lfarm-admin lfarm-client lfarm-common lfarm-gss lfarm-launcher lfarm-ssl
lfarm-test)
PARASITES NIL) */
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lfarm-ssl'';
version = ''lfarm-20150608-git'';

description = ''SSL support for lfarm'';

deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
};

packageName = "lfarm-ssl";

asdFilesToKeep = ["lfarm-ssl.asd"];
overrides = x: x;
}
/* (SYSTEM lfarm-ssl DESCRIPTION SSL support for lfarm SHA256
1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66 URL
http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz
MD5 4cc91df44a932b3175a1eabf73d6e42d NAME lfarm-ssl FILENAME lfarm-ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl)
(NAME cl-store FILENAME cl-store)
(NAME flexi-streams FILENAME flexi-streams)
(NAME lfarm-common FILENAME lfarm-common)
(NAME split-sequence FILENAME split-sequence)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-garbage FILENAME trivial-garbage)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
(NAME usocket FILENAME usocket))
DEPENDENCIES
(alexandria babel bordeaux-threads cffi cl+ssl cl-store flexi-streams
lfarm-common split-sequence trivial-features trivial-garbage
trivial-gray-streams usocket)
VERSION lfarm-20150608-git SIBLINGS
(lfarm-admin lfarm-client lfarm-common lfarm-gss lfarm-launcher
lfarm-server lfarm-test)
PARASITES NIL) */
3 changes: 3 additions & 0 deletions pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
Original file line number Diff line number Diff line change
@@ -95,6 +95,9 @@ let-plus
lev
lisp-namespace
local-time
lfarm-client
lfarm-server
lfarm-ssl
lparallel
lquery
marshal
69 changes: 69 additions & 0 deletions pkgs/development/lisp-modules/quicklisp-to-nix.nix
Original file line number Diff line number Diff line change
@@ -20,6 +20,21 @@ let quicklisp-to-nix-packages = rec {
}));


"lfarm-common" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lfarm-common" or (x: {}))
(import ./quicklisp-to-nix-output/lfarm-common.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cl-store" = quicklisp-to-nix-packages."cl-store";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
"usocket" = quicklisp-to-nix-packages."usocket";
}));


"stefil" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."stefil" or (x: {}))
@@ -1234,6 +1249,60 @@ let quicklisp-to-nix-packages = rec {
}));


"lfarm-ssl" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lfarm-ssl" or (x: {}))
(import ./quicklisp-to-nix-output/lfarm-ssl.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cffi" = quicklisp-to-nix-packages."cffi";
"cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
"cl-store" = quicklisp-to-nix-packages."cl-store";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"lfarm-common" = quicklisp-to-nix-packages."lfarm-common";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
"usocket" = quicklisp-to-nix-packages."usocket";
}));


"lfarm-server" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lfarm-server" or (x: {}))
(import ./quicklisp-to-nix-output/lfarm-server.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cl-store" = quicklisp-to-nix-packages."cl-store";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"lfarm-common" = quicklisp-to-nix-packages."lfarm-common";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
"usocket" = quicklisp-to-nix-packages."usocket";
}));


"lfarm-client" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lfarm-client" or (x: {}))
(import ./quicklisp-to-nix-output/lfarm-client.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cl-store" = quicklisp-to-nix-packages."cl-store";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"lfarm-common" = quicklisp-to-nix-packages."lfarm-common";
"lparallel" = quicklisp-to-nix-packages."lparallel";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
"usocket" = quicklisp-to-nix-packages."usocket";
}));


"local-time" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."local-time" or (x: {}))
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/pyside/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:
{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa }:

# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
buildPythonPackage rec {
@@ -15,12 +15,13 @@ buildPythonPackage rec {

nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];

buildInputs = [ mesa ];

makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner";

meta = {
description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
license = lib.licenses.lgpl21;
homepage = http://www.pyside.org;
broken = true;
};
}