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

Commits on Apr 26, 2020

  1. torque: substitute /bin/cp

    Tom Bereknyei committed Apr 26, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    nomadium Miguel Landaeta
    GPG key ID: AFB8E0FC9231CC6D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bba6c10 View commit details

  2. Merge pull request #86083 from tomberek/torque/cp

    @Mic92
    Mic92 authored Apr 26, 2020
    Copy the full SHA
    aac4c85 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/servers/computing/torque/default.nix
6 changes: 5 additions & 1 deletion pkgs/servers/computing/torque/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux
, file, libtool, which, boost, autoreconfHook
, coreutils, file, libtool, which, boost, autoreconfHook
}:

stdenv.mkDerivation rec {
@@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
--replace "contrib/init.d contrib/systemd" ""
substituteInPlace src/cmds/Makefile.am \
--replace "/etc/" "$out/etc/"
substituteInPlace src/mom_rcp/pathnames.h \
--replace /bin/cp ${coreutils}/bin/cp
substituteInPlace src/resmom/requests.c \
--replace /bin/cp ${coreutils}/bin/cp
'';

preConfigure = ''