From aa513180c524b1487bfb879475d6d0512b9fa64b Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sat, 6 May 2017 12:55:32 -0700 Subject: go: 1.8 -> 1.8.1 --- pkgs/development/compilers/go/1.8.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 60125b2e22a..e4cd29fc62b 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch -, pcre, cacert +, pcre, cacert, llvm , Security, Foundation, bash }: let @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0plm11rqrqz7frwz0jjcm13x939yhny755ks1adxjzmsngln9prl"; + sha256 = "1157mmzjpk887cpcpn2qy9c69anc22c4p3cjpl84zl7an41x660j"; }; # perl is used for testing go vet @@ -110,15 +110,13 @@ stdenv.mkDerivation rec { ./ssl-cert-file-1.8.patch ./creds-test.patch ./remove-test-pie-1.8.patch - - # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch - # works fine here for now. - (fetchpatch { - url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; - sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; - }) ]; + postPatch = optionalString stdenv.isDarwin '' + echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" + substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil + ''; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; -- cgit 1.4.1 From 9943e5635c592e284ac5a023822cce563ff9b236 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sun, 7 May 2017 21:44:33 +0200 Subject: ponyc: 0.13.1 -> 0.14.0 https://github.com/ponylang/ponyc/issues/1877 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 0a90927751a..6b7f87b1e95 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1x3w7mxpwgf2bn2c1qqxbj4w5gp775l7r42lj9jvspayb6a6w28s"; + sha256 = "0zzr3mmjp7010d3jfly6lbwaib546praml97kgj92yixahnwz533"; }; buildInputs = [ llvm makeWrapper which ]; -- cgit 1.4.1 From 19ebff1d95dae17cff81f8e9c133d82827317ed2 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sun, 7 May 2017 14:09:24 -0700 Subject: go: 1.7.4 -> 1.7.5 --- pkgs/development/compilers/go/1.7.nix | 6 +- pkgs/development/compilers/go/1.8.nix | 2 +- .../compilers/go/ssl-cert-file-1.7.patch | 78 --------------------- .../compilers/go/ssl-cert-file-1.8.patch | 80 ---------------------- pkgs/development/compilers/go/ssl-cert-file.patch | 80 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 6 files changed, 86 insertions(+), 166 deletions(-) delete mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.7.patch delete mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.8.patch create mode 100644 pkgs/development/compilers/go/ssl-cert-file.patch (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 76f6141e2e3..7ecae36a4d5 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1ks3xph20afrfp3vqs1sjnkpjb0lgxblv8706wa3iiyg7rka4axv"; + sha256 = "00radlwbrssn0x3naamb33cfx7ap2jv7s51bqr705nmn2j5yyblk"; }; # perl is used for testing go vet @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.7.patch - ./ssl-cert-file-1.7.patch + ./ssl-cert-file.patch ./creds-test.patch # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 60125b2e22a..48948430cb2 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.8.patch - ./ssl-cert-file-1.8.patch + ./ssl-cert-file.patch ./creds-test.patch ./remove-test-pie-1.8.patch diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.7.patch b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch deleted file mode 100644 index e35ad9e4b75..00000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.7.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go -index a4b33c7..9700b75 100644 ---- a/src/crypto/x509/root_cgo_darwin.go -+++ b/src/crypto/x509/root_cgo_darwin.go -@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) { - import "C" - import ( - "errors" -+ "io/ioutil" -+ "os" - "unsafe" - ) - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - var data C.CFDataRef = nil - err := C.FetchPEMRoots(&data) -diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go -index 59b303d..d4a34ac 100644 ---- a/src/crypto/x509/root_darwin.go -+++ b/src/crypto/x509/root_darwin.go -@@ -28,16 +28,25 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - // The linker will not include these unused functions in binaries built with cgo enabled. - - func execSecurityRoots() (*CertPool, error) { -+ var ( -+ mu sync.Mutex -+ roots = NewCertPool() -+ ) -+ -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") - data, err := cmd.Output() - if err != nil { - return nil, err - } - -- var ( -- mu sync.Mutex -- roots = NewCertPool() -- ) - add := func(cert *Certificate) { - mu.Lock() - defer mu.Unlock() -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index 7bcb3d6..3986e1a 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - var firstErr error - for _, file := range certFiles { - data, err := ioutil.ReadFile(file) diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.8.patch b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch deleted file mode 100644 index 052655eed52..00000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.8.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go -index a4b33c7..9700b75 100644 ---- a/src/crypto/x509/root_cgo_darwin.go -+++ b/src/crypto/x509/root_cgo_darwin.go -@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) { - import "C" - import ( - "errors" -+ "io/ioutil" -+ "os" - "unsafe" - ) - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - var data C.CFDataRef = nil - err := C.FetchPEMRoots(&data) -diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go -index 66cdb5e..bb28036 100644 ---- a/src/crypto/x509/root_darwin.go -+++ b/src/crypto/x509/root_darwin.go -@@ -61,17 +61,25 @@ func execSecurityRoots() (*CertPool, error) { - println(fmt.Sprintf("crypto/x509: %d certs have a trust policy", len(hasPolicy))) - } - -- cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") -- data, err := cmd.Output() -- if err != nil { -- return nil, err -- } -- - var ( - mu sync.Mutex - roots = NewCertPool() - numVerified int // number of execs of 'security verify-cert', for debug stats - ) - -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ -+ cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") -+ data, err := cmd.Output() -+ if err != nil { -+ return nil, err -+ } -+ - blockCh := make(chan *pem.Block) - var wg sync.WaitGroup -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index 7bcb3d6..3986e1a 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - var firstErr error - for _, file := range certFiles { - data, err := ioutil.ReadFile(file) diff --git a/pkgs/development/compilers/go/ssl-cert-file.patch b/pkgs/development/compilers/go/ssl-cert-file.patch new file mode 100644 index 00000000000..052655eed52 --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file.patch @@ -0,0 +1,80 @@ +diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +index a4b33c7..9700b75 100644 +--- a/src/crypto/x509/root_cgo_darwin.go ++++ b/src/crypto/x509/root_cgo_darwin.go +@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) { + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + var data C.CFDataRef = nil + err := C.FetchPEMRoots(&data) +diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +index 66cdb5e..bb28036 100644 +--- a/src/crypto/x509/root_darwin.go ++++ b/src/crypto/x509/root_darwin.go +@@ -61,17 +61,25 @@ func execSecurityRoots() (*CertPool, error) { + println(fmt.Sprintf("crypto/x509: %d certs have a trust policy", len(hasPolicy))) + } + +- cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") +- data, err := cmd.Output() +- if err != nil { +- return nil, err +- } +- + var ( + mu sync.Mutex + roots = NewCertPool() + numVerified int // number of execs of 'security verify-cert', for debug stats + ) + ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ ++ cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") ++ data, err := cmd.Output() ++ if err != nil { ++ return nil, err ++ } ++ + blockCh := make(chan *pem.Block) + var wg sync.WaitGroup +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index 7bcb3d6..3986e1a 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ + var firstErr error + for _, file := range certFiles { + data, err := ioutil.ReadFile(file) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27139adc7a4..b2540cbe206 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5348,11 +5348,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go_1_7 = callPackage ../development/compilers/go/1.7.nix ({ + go_1_7 = callPackage ../development/compilers/go/1.7.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { - stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38; - }); + }; go_1_8 = callPackage ../development/compilers/go/1.8.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; -- cgit 1.4.1 From 31b0e34d1dd1226de1492101e3aeea60292196d7 Mon Sep 17 00:00:00 2001 From: rht Date: Tue, 9 May 2017 10:31:15 +0700 Subject: Use consistent package naming for HEAD.nix files --- pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix | 3 ++- pkgs/development/compilers/ghc/head.nix | 4 ++-- pkgs/development/compilers/ghcjs/head.nix | 2 +- pkgs/development/coq-modules/fiat/HEAD.nix | 4 ++-- pkgs/development/libraries/xcb-util-cursor/HEAD.nix | 3 ++- 5 files changed, 9 insertions(+), 7 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index 5d44173729d..0f6227a44a3 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -1,7 +1,8 @@ { stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: stdenv.mkDerivation (rec { - name = "ProofGeneral-HEAD"; + name = "ProofGeneral-unstable-${version}"; + version = "2017-03-13"; src = fetchgit { url = "https://github.com/ProofGeneral/PG.git"; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 006a9f8fbc4..1bf2d4b0ef0 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -12,7 +12,7 @@ let commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - version = "8.1.20170106"; + version = "2017-01-06"; rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; commonPreConfigure = '' @@ -29,7 +29,7 @@ let ''; in stdenv.mkDerivation (rec { inherit version rev; - name = "ghc-${version}"; + name = "ghc-unstable-${version}"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 591660f5c34..70f2b942e72 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,7 +1,7 @@ { fetchgit, fetchFromGitHub, bootPkgs }: bootPkgs.callPackage ./base.nix { - version = "0.2.020170323"; + version = "2017-03-23"; inherit bootPkgs; diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index a92c14bdbff..fe9f3307b7a 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -2,8 +2,8 @@ stdenv.mkDerivation rec { - name = "coq-fiat-${coq.coq-version}-${version}"; - version = "20161024"; + name = "coq-fiat-${coq.coq-version}-unstable-${version}"; + version = "2016-10-24"; src = fetchgit { url = "https://github.com/mit-plv/fiat.git"; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index af1a3b4e095..81ac75489ba 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -2,7 +2,8 @@ , git, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { - name = "xcb-util-cursor-0.1.1-3-gf03cc27"; + name = "xcb-util-cursor-0.1.1-3-unstable-${version}"; + version = "2017-04-05"; src = fetchgit { url = http://anongit.freedesktop.org/git/xcb/util-cursor.git; -- cgit 1.4.1 From a5df611d9134d6816e110603d55cea384c2f272a Mon Sep 17 00:00:00 2001 From: David Johnson Date: Mon, 8 May 2017 12:46:14 -0700 Subject: ghcjs: mark as fixed --- pkgs/development/compilers/ghcjs/base.nix | 2 +- pkgs/development/compilers/ghcjs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index ab68a8fe3b5..4c9ae16a313 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -190,6 +190,6 @@ in mkDerivation (rec { description = "A Haskell to JavaScript compiler that uses the GHC API"; license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; + maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio ]; inherit broken; }) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index eda724e5947..f23da1149c5 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -2,5 +2,5 @@ bootPkgs.callPackage ./base.nix { inherit bootPkgs; - broken = true; # http://hydra.nixos.org/build/45110274 + broken = false; } -- cgit 1.4.1 From bd03033b498f738419a3c18108c61896c8ac3eb3 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 9 May 2017 14:10:29 +0900 Subject: gnu-cobol: init at 2.0rc-2 --- pkgs/development/compilers/gnu-cobol/default.nix | 35 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/compilers/gnu-cobol/default.nix (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix new file mode 100644 index 00000000000..e5ec3659f0b --- /dev/null +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, gcc, makeWrapper +, db, gmp, ncurses }: + +let version = { + maj = "2.0"; + min = "rc-2"; +}; +in +stdenv.mkDerivation rec { + name = "gnu-cobol-${version.maj}${version.min}"; + + src = fetchurl { + url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version.maj}/gnu-cobol-${version.maj}_${version.min}.tar.gz"; + sha256 = "1pj7mjnp3l76zvzrh1xa6d4kw3jkvzqh39sbf02kiinq4y65s7zj"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ db gmp ncurses ]; + + postInstall = with stdenv.lib; '' + wrapProgram "$out/bin/cobc" \ + --prefix PATH ':' "${gcc}/bin" \ + --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ + --prefix NIX_CFLAGS_COMPILE ' ' "'$NIX_CFLAGS_COMPILE'" + ''; + + meta = with stdenv.lib; { + description = "An open-source COBOL compiler"; + homepage = http://sourceforge.net/projects/open-cobol/; + license = licenses.gpl3; + maintainers = with maintainers; [ ericsagnes ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bebd1058e97..e17559bb9c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2039,6 +2039,8 @@ with pkgs; gnuapl = callPackage ../development/interpreters/gnu-apl { }; + gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; + gnufdisk = callPackage ../tools/system/fdisk { guile = guile_1_8; }; -- cgit 1.4.1 From a1b6c5f5d6f22088dc017552c94d133128059ad8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 May 2017 17:59:28 +0200 Subject: Revert "Use consistent package naming for HEAD.nix files" for GHC and GHCjs. This reverts commit 31b0e34d1dd1226de1492101e3aeea60292196d7. The version numbers used in that commit were no improvement. --- pkgs/development/compilers/ghc/head.nix | 4 ++-- pkgs/development/compilers/ghcjs/head.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 1bf2d4b0ef0..006a9f8fbc4 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -12,7 +12,7 @@ let commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - version = "2017-01-06"; + version = "8.1.20170106"; rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; commonPreConfigure = '' @@ -29,7 +29,7 @@ let ''; in stdenv.mkDerivation (rec { inherit version rev; - name = "ghc-unstable-${version}"; + name = "ghc-${version}"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 70f2b942e72..591660f5c34 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,7 +1,7 @@ { fetchgit, fetchFromGitHub, bootPkgs }: bootPkgs.callPackage ./base.nix { - version = "2017-03-23"; + version = "0.2.020170323"; inherit bootPkgs; -- cgit 1.4.1